commit 1eea9a3d3d2fbbaac0144317073a50a93ac1d775 Author: Jan Chaloupka jchaloup@redhat.com Date: Wed Jan 28 19:26:45 2015 +0100
Add patches
rename-import-paths.patch | 27 +++++++++++++++++++++++++++ update-tests-to-etcd-2.0.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) --- diff --git a/rename-import-paths.patch b/rename-import-paths.patch new file mode 100644 index 0000000..f205138 --- /dev/null +++ b/rename-import-paths.patch @@ -0,0 +1,27 @@ +From 3eedc089ba9be8ac3c11bae084b95b8c34728a48 Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Fri, 23 Jan 2015 15:05:29 +0100 +Subject: [PATCH] patch + +--- + pkg/cloudprovider/gce/gce.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pkg/cloudprovider/gce/gce.go b/pkg/cloudprovider/gce/gce.go +index 65e62f6..b240ac6 100644 +--- a/pkg/cloudprovider/gce/gce.go ++++ b/pkg/cloudprovider/gce/gce.go +@@ -32,8 +32,8 @@ import ( + "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + "github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider" + +- compute "code.google.com/p/google-api-go-client/compute/v1" +- container "code.google.com/p/google-api-go-client/container/v1beta1" ++ compute "google.golang.org/api/compute/v1" ++ container "google.golang.org/api/container/v1beta1" + "github.com/golang/glog" + "golang.org/x/oauth2" + "golang.org/x/oauth2/google" +-- +1.9.3 + diff --git a/update-tests-to-etcd-2.0.patch b/update-tests-to-etcd-2.0.patch new file mode 100644 index 0000000..cda5729 --- /dev/null +++ b/update-tests-to-etcd-2.0.patch @@ -0,0 +1,32 @@ +From 8f1eb1cd89d155aee111b69db8b1b6af119a1422 Mon Sep 17 00:00:00 2001 +From: rpm-build <rpm-build> +Date: Wed, 28 Jan 2015 18:41:42 +0100 +Subject: [PATCH] update tests to etcd-2.0 + +--- + hack/lib/etcd.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh +index a783454..917649a 100644 +--- a/hack/lib/etcd.sh ++++ b/hack/lib/etcd.sh +@@ -32,10 +32,13 @@ kube::etcd::start() { + + # Start etcd + ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX) +- etcd -name test -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null & ++ etcd -name default -data-dir ${ETCD_DIR} -addr ${host}:${port} >/dev/null 2>/dev/null & + ETCD_PID=$! + +- kube::util::wait_for_url "http://$%7Bhost%7D:$%7Bport%7D/v2/keys/" "etcd: " ++ # no key => error on http://127.0.0.1:4001/v2/keys => test version ++ kube::util::wait_for_url "http://$%7Bhost%7D:$%7Bport%7D/version" "etcd: " ++ # no key => error on http://127.0.0.1:4001/v2/keys => fails on integration test => add one key ++ curl -L http://$%7Bhost%7D:$%7Bport%7D/v2/keys/kube_etcd_test_key -XPUT -d value="kube_etcd_test_key value" + } + + kube::etcd::cleanup() { +-- +1.9.3 +
golang@lists.fedoraproject.org