Merge pull request #9030 from brendandburns/kubectl

Add a custom timeout flag for stop/delete.
2015-06-03 21:14:50 -07:00
parent 398aebea71 ab0c9b8e1e
commit e7788771d6
12 changed files with 44 additions and 20 deletions
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -184,7 +184,7 @@ func StopRC(rc *api.ReplicationController, restClient *client.Client) error {
 	if err != nil || reaper == nil {
 		return err
 	}
-	_, err = reaper.Stop(rc.Namespace, rc.Name, nil)
+	_, err = reaper.Stop(rc.Namespace, rc.Name, 0, nil)
 	if err != nil {
 		return err
 	}