jcapik pushed to kubernetes (master). "Bump to upstream 55793ac2066745f7243c666316499e1a8cf074f0"

[notifications at fedoraproject.org]

From d1d157530851726a8f88def5c20e23c2a3bba5c2 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 30 Jan 2015 15:12:55 +0100
Subject: Bump to upstream 55793ac2066745f7243c666316499e1a8cf074f0


diff --git a/.gitignore b/.gitignore
index 20e391c..749b702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-ca6de16.tar.gz
+/kubernetes-55793ac.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index f32d82a..282e31d 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -5,7 +5,7 @@
 %global project		GoogleCloudPlatform
 %global repo		kubernetes
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit		ca6de16df7762d4fc9b4ad44baa78d22e3f30742
+%global commit		55793ac2066745f7243c666316499e1a8cf074f0
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -15,7 +15,7 @@
 
 Name:		kubernetes
 Version:	0.9.1
-Release:	0.2.git%{shortcommit}%{?dist}
+Release:	0.3.git%{shortcommit}%{?dist}
 Summary:	Container cluster management
 License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
@@ -42,7 +42,6 @@ BuildRequires:	hostname
 Patch0: Change-docker.socket-dependency-to-docker.service.patch
 %if 0%{?fedora}
 Patch1: rename-import-paths.patch
-Patch2: update-tests-to-etcd-2.0.patch
 
 # needed for go cover.  Not available in RHEL/CentOS (available in Fedora/EPEL)
 BuildRequires:	golang-cover
@@ -303,7 +302,7 @@ building other packages which use %{project}/%{repo}.
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.9.1
+export KUBE_GIT_VERSION=v0.9.0-331-g55793ac2066745
 
 %if 0%{?fedora}
 export KUBE_GIT_TREE_STATE="dirty"
@@ -413,6 +412,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri Jan 30 2015 jchaloup <jchaloup at redhat.com> - 0.9.1-0.3.git55793ac
+- Bump to upstream 55793ac2066745f7243c666316499e1a8cf074f0
+
 * Thu Jan 29 2015 jchaloup <jchaloup at redhat.com> - 0.9.1-0.2.gitca6de16
 - Bump to upstream ca6de16df7762d4fc9b4ad44baa78d22e3f30742
 - Change docker.socket dependency to docker.service
diff --git a/sources b/sources
index e3e4b46..fbd1b82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7ec6a3dbdc1a1b785174d2c49338cea  kubernetes-ca6de16.tar.gz
+2f876e87ae4a33fa77cf7ea587a2d764  kubernetes-55793ac.tar.gz
diff --git a/update-tests-to-etcd-2.0.patch b/update-tests-to-etcd-2.0.patch
deleted file mode 100644
index cda5729..0000000
--- a/update-tests-to-etcd-2.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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://${host}:${port}/v2/keys/" "etcd: "
-+  # no key => error on http://127.0.0.1:4001/v2/keys => test version
-+  kube::util::wait_for_url "http://${host}:${port}/version" "etcd: "
-+  # no key => error on http://127.0.0.1:4001/v2/keys => fails on integration test => add one key
-+  curl -L http://${host}:${port}/v2/keys/kube_etcd_test_key -XPUT -d value="kube_etcd_test_key value"
- }
- 
- kube::etcd::cleanup() {
--- 
-1.9.3
-
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=master&id=d1d157530851726a8f88def5c20e23c2a3bba5c2