From 10f01d872c7bc4dff9d64f3ffbb6c3e7e8ba2ab8 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: May 29 2015 07:22:15 +0000
Subject: Bump to upstream ed4898d98c46869e9cbdb44186dfdeda9ff80cc2

- related: #1211266

---

diff --git a/.gitignore b/.gitignore
index 15f560a..141afa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-6fa2777.tar.gz
+/kubernetes-ed4898d.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 6fec8af..ecbc4c2 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -10,7 +10,7 @@
 %global repo		kubernetes
 # https://github.com/GoogleCloudPlatform/kubernetes
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit		6fa2777e26559fc008eacac83eb165d25bd9a7de
+%global commit		ed4898d98c46869e9cbdb44186dfdeda9ff80cc2
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -20,7 +20,7 @@
 
 Name:		kubernetes
 Version:	0.17.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -338,7 +338,7 @@ Kubernetes services for node host
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.17.1-915-g6fa2777e26559f
+export KUBE_GIT_VERSION=v0.17.1-1030-ged4898d98c4686
 
 hack/build-go.sh --use_go_build
 hack/build-go.sh --use_go_build cmd/kube-version-change
@@ -498,6 +498,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri May 29 2015 jchaloup <jchaloup@redhat.com> - 0.17.1-6
+- Bump to upstream ed4898d98c46869e9cbdb44186dfdeda9ff80cc2
+  related: #1211266
+
 * Thu May 28 2015 jchaloup <jchaloup@redhat.com> - 0.17.1-5
 - Bump to upstream 6fa2777e26559fc008eacac83eb165d25bd9a7de
   related: #1211266
diff --git a/sources b/sources
index 02f8bab..339ad88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e823af7ccdcdc3278c2afdf01c0654fd  kubernetes-6fa2777.tar.gz
+3de06f4654a1322074f1198c51d09c89  kubernetes-ed4898d.tar.gz