diff --git a/.gitignore b/.gitignore index dbf7ba5..0e98fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/contrib-7fbd252.tar.gz SOURCES/go-bindata-a0ff256.tar.gz SOURCES/kubernetes-43a9be4.tar.gz -SOURCES/ose-d33fd89.tar.gz +SOURCES/ose-269f928.tar.gz diff --git a/.kubernetes.metadata b/.kubernetes.metadata index ad0ff39..789be89 100644 --- a/.kubernetes.metadata +++ b/.kubernetes.metadata @@ -1,4 +1,4 @@ aeadd20e11fecfec6428039206120bdc91d6ad3c SOURCES/contrib-7fbd252.tar.gz 7d5ccafe85f5c869b7abc6a23e4c193436239468 SOURCES/go-bindata-a0ff256.tar.gz 8a5787aafcce589f332e71c1be4c4bce7133125e SOURCES/kubernetes-43a9be4.tar.gz -dc152ccf66ada75bf94503e15b1af3cd651eca09 SOURCES/ose-d33fd89.tar.gz +bc5a4d1de713e7c5f4df56b9ccc2fb799ff2fc10 SOURCES/ose-269f928.tar.gz diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec index 1eaaf00..51bb8c6 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 d33fd89e399396658aed4e48dfe7d5d8d50ac6e8 +%global commit 269f928217957e7126dc87e6adfa82242bfe5b1e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global openshift_ip github.com/openshift/origin @@ -57,7 +57,7 @@ %global O4N_GIT_MAJOR_VERSION 3 %global O4N_GIT_MINOR_VERSION 4+ -%global O4N_GIT_VERSION v3.5.5.11 +%global O4N_GIT_VERSION v3.5.5.23 %global K8S_GIT_VERSION v1.5.2-47-g43a9be4 %global kube_version 1.5.2 %global kube_git_version v%{kube_version} @@ -69,7 +69,7 @@ Name: kubernetes Version: %{kube_version} -Release: 0.6.git%{shortcommit}%{?dist} +Release: 0.7.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -476,6 +476,10 @@ fi %systemd_postun %changelog +* Tue Jun 06 2017 Jan Chaloupka - 1.5.2-0.7.git269f928 +- Update to ose v3.5.5.23 + resolves: #1459174 + * Tue May 02 2017 Jan Chaloupka - 1.5.2-0.6.gita552679 - Update to ose v3.5.5.11 resolves: #1447353