Merge pull request #1464 from hmrm/add-etcd-config

Allow etcd config file to be passed to apiserver, kubelet, and proxy
This commit is contained in:
Daniel Smith
2014-10-08 16:29:46 -07:00
6 changed files with 67 additions and 25 deletions

View File

@@ -38,7 +38,7 @@ func init() {
}
func TestClient(t *testing.T) {
helper, err := master.NewEtcdHelper(newEtcdClient().GetCluster(), "v1beta1")
helper, err := master.NewEtcdHelper(newEtcdClient(), "v1beta1")
if err != nil {
t.Fatalf("unexpected error: %v", err)
}