fix broken files after rebase

2015-09-12 15:27:05 -07:00
parent f2e12b765b
commit f5023929d8
8 changed files with 12 additions and 16 deletions
--- a/test/integration/framework/master_utils.go
+++ b/test/integration/framework/master_utils.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/latest"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	explatest "k8s.io/kubernetes/pkg/apis/experimental/latest"
 	"k8s.io/kubernetes/pkg/apiserver"
 	"k8s.io/kubernetes/pkg/client/record"
 	client "k8s.io/kubernetes/pkg/client/unversioned"