Merge pull request #1232 from convox/20160915

[RELEASE] 20160915
convox · Sep 16, 2016 · ba9ad13 · ba9ad13
2 parents b7220de + c59efc5
commit ba9ad13
Show file tree

Hide file tree

Showing 52 changed files with 4,856 additions and 611 deletions.
diff --git a/api/workers/autoscale.go b/api/workers/autoscale.go
@@ -81,7 +81,12 @@ func autoscaleRack() {
 
 	log.Logf("change=%d", (desired - system.Count))
 
-	system.Count = desired
+	// ok to start multiple but shut them down one at a time
+	if desired < system.Count {
+		system.Count--
+	} else {
+		system.Count = desired
+	}
 
 	err = models.Provider().SystemSave(*system)
 	if err != nil {

diff --git a/cmd/convox/start.go b/cmd/convox/start.go
@@ -37,7 +37,7 @@ func init() {
 			},
 			cli.BoolFlag{
 				Name:  "no-sync",
-				Usage: "synchronize local file changes into the running containers",
+				Usage: "do not synchronize local file changes into the running containers",
 			},
 		},
 	})

diff --git a/vendor/github.com/convox/logger/logger.go b/vendor/github.com/convox/logger/logger.go
diff --git a/vendor/github.com/docker/docker/opts/hosts.go b/vendor/github.com/docker/docker/opts/hosts.go
diff --git a/vendor/github.com/docker/docker/opts/hosts_unix.go b/vendor/github.com/docker/docker/opts/hosts_unix.go
diff --git a/vendor/github.com/docker/docker/opts/hosts_windows.go b/vendor/github.com/docker/docker/opts/hosts_windows.go
diff --git a/vendor/github.com/docker/docker/opts/ip.go b/vendor/github.com/docker/docker/opts/ip.go