diff --git a/.gitignore b/.gitignore index 1bee70c..c0b04ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /kubernetes-4c8e6f4.tar.gz /contrib-1c4eb2d.tar.gz -/origin-bf56e23.tar.gz +/origin-e1d9873.tar.gz diff --git a/kubernetes.spec b/kubernetes.spec index 8f97537..17397bc 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -21,7 +21,7 @@ # https://github.com/openshift/origin %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit bf56e235826baded1772fb340266b8419c3e8f30 +%global commit e1d9873c1d5711b83fd3dd7eefe83a88ceb92c08 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global openshift_ip github.com/openshift/origin @@ -60,7 +60,7 @@ Name: kubernetes Version: %{kube_version} -Release: 0.4.alpha1.git%{k8s_shortcommit}%{?dist} +Release: 0.5.alpha1.git%{k8s_shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -734,6 +734,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Thu Jan 21 2016 jchaloup - 1.2.0-0.5.alpha1.git4c8e6f4 +- Bump to upstream e1d9873c1d5711b83fd3dd7eefe83a88ceb92c08 + related: #1291860 + * Thu Jan 07 2016 jchaloup - 1.2.0-0.4.alpha1.git4c8e6f4 - Move definition of all version, git and commit macros at one place resolves: #1291860 diff --git a/sources b/sources index ef560ca..0bad90c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 8e652c2ab7360390d0e65a6bad9fee04 kubernetes-4c8e6f4.tar.gz 3954b7cbf55609b5b5b65030a01b32c7 contrib-1c4eb2d.tar.gz -4cfd258b1e7c104cafa4e39ca52e1ffb origin-bf56e23.tar.gz +5abc68b7efbe6b9d58769ded0cddcc15 origin-e1d9873.tar.gz