diff --git a/.gitignore b/.gitignore index 2f56ea4..fb770ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/contrib-7fbd252.tar.gz SOURCES/kubernetes-114a51d.tar.gz -SOURCES/ose-738b760.tar.gz +SOURCES/ose-a4463d9.tar.gz diff --git a/.kubernetes.metadata b/.kubernetes.metadata index a7dd4b9..36f02b1 100644 --- a/.kubernetes.metadata +++ b/.kubernetes.metadata @@ -1,3 +1,3 @@ aeadd20e11fecfec6428039206120bdc91d6ad3c SOURCES/contrib-7fbd252.tar.gz d9fc239ea31e622f4226d461bf5e5942001b34d6 SOURCES/kubernetes-114a51d.tar.gz -0db66cd61859e345b8a7b14860ff8adf693a3908 SOURCES/ose-738b760.tar.gz +7854b0cf93258f47d4fd19e9f8196cb6e7778af5 SOURCES/ose-a4463d9.tar.gz diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec index 356db27..54b42c4 100644 --- a/SPECS/kubernetes.spec +++ b/SPECS/kubernetes.spec @@ -21,7 +21,7 @@ # https://github.com/openshift/ose %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit 738b7603b042dcda7a5ba419ab0e7f40a617080c +%global commit a4463d9a1accc9c61ae90ce5d314e248f16b9f05 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global openshift_ip github.com/openshift/origin @@ -48,7 +48,7 @@ %global O4N_GIT_MAJOR_VERSION 3 %global O4N_GIT_MINOR_VERSION 2+ -%global O4N_GIT_VERSION v3.2.0.15 +%global O4N_GIT_VERSION v3.2.0.44 %global K8S_GIT_VERSION v1.2.0-36-g4a3f9c5b19c7 %global kube_version 1.2.0 %global kube_git_version v%{kube_version} @@ -60,7 +60,7 @@ Name: kubernetes Version: %{kube_version} -Release: 0.11.git%{shortcommit}%{?dist} +Release: 0.12.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -401,6 +401,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Sun May 29 2016 jchaloup - 1.2.0-0.12.gita4463d9 +- Update to ose v3.2.0.44 + resolves: #1340646 + * Tue Apr 19 2016 jchaloup - 1.2.0-0.11.git738b760 - Set correct permissions for kubernetes-unit-test/docs/user-guide/ui.md (not shipped) related: #1327666