Merge pull request #12848 from wojtek-t/private_watch_cache

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-03 13:06:18 -07:00
22 changed files with 113 additions and 332 deletions

View File

@@ -910,7 +910,7 @@ func TestDeleteControllerAndExpectations(t *testing.T) {
// This should have no effect, since we've deleted the rc.
podExp.Seen(1, 0)
manager.podStore.Store.Replace(make([]interface{}, 0))
manager.podStore.Store.Replace(make([]interface{}, 0), "0")
manager.syncReplicationController(getKey(rc, t))
validateSyncReplication(t, &fakePodControl, 0, 0)
}