Merge pull request #15510 from aveshagarwal/master-selflink-objref

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-27 00:37:21 -07:00
7 changed files with 6 additions and 25 deletions

View File

@@ -39,10 +39,6 @@ import (
var alwaysReady = func() bool { return true }
func init() {
api.ForTesting_ReferencesAllowBlankSelfLinks = true
}
func getKey(rc *api.ReplicationController, t *testing.T) string {
if key, err := controller.KeyFunc(rc); err != nil {
t.Errorf("Unexpected error getting key for rc %v: %v", rc.Name, err)