Merge branch 'release/1.6.0'

api/main.go

@@ -6,7 +6,7 @@ import (
 
 // main is the entry point of the program
 func main() {
-	kingpin.Version("1.5.0")
+	kingpin.Version("1.6.0")
 	var (
 		endpoint  = kingpin.Flag("host", "Dockerd endpoint").Default("unix:///var/run/docker.sock").Short('H').String()
 		addr      = kingpin.Flag("bind", "Address and port to serve UI For Docker").Default(":9000").Short('p').String()

app/app.js

@@ -156,4 +156,4 @@ angular.module('uifordocker', [
   .constant('DOCKER_ENDPOINT', 'dockerapi')
   .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred.  If you have a port, prefix it with a ':' i.e. :4243
   .constant('CONFIG_ENDPOINT', 'settings')
-  .constant('UI_VERSION', 'v1.5.0');
+  .constant('UI_VERSION', 'v1.6.0');

app/components/dashboard/dashboard.html

@@ -8,7 +8,7 @@
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12" ng-if="!swarm">
     <rd-widget>
-      <rd-widget-header icon="fa-cogs" title="Node info"></rd-widget-header>
+      <rd-widget-header icon="fa-tachometer" title="Node info"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>
@@ -35,7 +35,7 @@
   </div>
   <div class="col-lg-12 col-md-12 col-xs-12" ng-if="swarm">
     <rd-widget>
-      <rd-widget-header icon="fa-cogs" title="Cluster info"></rd-widget-header>
+      <rd-widget-header icon="fa-tachometer" title="Cluster info"></rd-widget-header>
       <rd-widget-body classes="no-padding">
         <table class="table">
           <tbody>

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "uifordocker",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "homepage": "https://github.com/kevana/ui-for-docker",
   "authors": [
     "Michael Crosby <crosbymichael@gmail.com>",

package.json

@@ -2,7 +2,7 @@
   "author": "Michael Crosby & Kevan Ahlquist",
   "name": "uifordocker",
   "homepage": "https://github.com/kevana/ui-for-docker",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:kevana/ui-for-docker.git"