Merge branch 'master' into git-2-point-8

Matthew Fisher · web-flow · commit 27ba77e6ff55 · 2016-06-22T08:33:15.000-07:00
diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ update-changelog:
 
 docker-build: build
 	docker build --rm -t ${IMAGE} rootfs
-	docker tag -f ${IMAGE} ${MUTABLE_IMAGE}
+	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 # Push to a registry that Kubernetes can access.
 docker-push:
diff --git a/pkg/healthsrv/healthz_handler.go b/pkg/healthsrv/healthz_handler.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	waitTimeout = 2 * time.Second
+	waitTimeout = 10 * time.Second
 )
 
 func healthZHandler(bLister BucketLister, serverCircuit *sshd.Circuit) http.Handler {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`const (`
`12`		`- waitTimeout = 2 * time.Second`
	`12`	`+ waitTimeout = 10 * time.Second`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func healthZHandler(bLister BucketLister, serverCircuit *sshd.Circuit) http.Handler {`