Rename the imported package to avoid name conflict (openshift#1603)

leonwanghui · pmorie · commit 31bbf5539dd3 · 2017-12-02T21:05:12.000-05:00
diff --git a/cmd/apiserver/app/server/run_server.go b/cmd/apiserver/app/server/run_server.go
@@ -27,7 +27,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/kubernetes-incubator/service-catalog/pkg/apiserver"
 	"github.com/kubernetes-incubator/service-catalog/pkg/apiserver/options"
-	"github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
+	registryserver "github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
 )
 
 // RunServer runs an API server with configuration according to opts
@@ -47,7 +47,7 @@ func RunServer(opts *ServiceCatalogServerOptions, stopCh <-chan struct{}) error
 		return err
 	}
 
-	if storageType == server.StorageTypeEtcd {
+	if storageType == registryserver.StorageTypeEtcd {
 		return runEtcdServer(opts, stopCh)
 	}
 	// This should never happen, catch for potential bugs

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/golang/glog"`
`28`	`28`	`"github.com/kubernetes-incubator/service-catalog/pkg/apiserver"`
`29`	`29`	`"github.com/kubernetes-incubator/service-catalog/pkg/apiserver/options"`
`30`		`- "github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"`
	`30`	`+ registryserver "github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// RunServer runs an API server with configuration according to opts`
`@@ -47,7 +47,7 @@ func RunServer(opts *ServiceCatalogServerOptions, stopCh <-chan struct{}) error`
`47`	`47`	`return err`
`48`	`48`	`}`
`49`	`49`
`50`		`- if storageType == server.StorageTypeEtcd {`
	`50`	`+ if storageType == registryserver.StorageTypeEtcd {`
`51`	`51`	`return runEtcdServer(opts, stopCh)`
`52`	`52`	`}`
`53`	`53`	`// This should never happen, catch for potential bugs`