Merge pull request #5851 from smarterclayton/support_input_streams

Support input streams being returned by the APIserver

pkg/controller/replication_controller_test.go

@@ -366,7 +366,7 @@ func TestWatchControllers(t *testing.T) {
 
 	select {
 	case <-received:
-	case <-time.After(10 * time.Millisecond):
+	case <-time.After(100 * time.Millisecond):
 		t.Errorf("Expected 1 call but got 0")
 	}
 }