Merge pull request #3104 from mrdunski/master

Issue #3101 - fixes high CPU load in hack/local-up-cluster.sh when no tty

Merge pull request #3104 from mrdunski/master
ed49fd52 · Brendan Burns · 057c6b8e · 02862f92 · ed49fd52
Commit ed49fd52 authored Dec 22, 2014 by Brendan Burns
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

local-up-cluster.sh hack/local-up-cluster.sh +1 -1

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -160,4 +160,4 @@ cleanup()

 trap cleanup EXIT

-while true; do read x; done
+while true; do sleep 1; done