diff --git a/.gitignore b/.gitignore index 04043c2..72f0285 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ SOURCES/contrib-7fbd252.tar.gz SOURCES/kubernetes-52492b4.tar.gz -SOURCES/ose-c5ee292.tar.gz +SOURCES/ose-86dc49a.tar.gz diff --git a/.kubernetes.metadata b/.kubernetes.metadata index c6350fa..07feba9 100644 --- a/.kubernetes.metadata +++ b/.kubernetes.metadata @@ -1,3 +1,3 @@ aeadd20e11fecfec6428039206120bdc91d6ad3c SOURCES/contrib-7fbd252.tar.gz a5da27c179948483d8f8ac60a16a1ece8bd7f72c SOURCES/kubernetes-52492b4.tar.gz -d79a66f2c100a215656c807628b00f3d3ebe1ec0 SOURCES/ose-c5ee292.tar.gz +4c12b884335c1347ee240dc6a330e12ef2fcbeba SOURCES/ose-86dc49a.tar.gz diff --git a/SPECS/kubernetes.spec b/SPECS/kubernetes.spec index a1041e2..b4c9476 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 c5ee292ce8f0df382b52096902778274c7eab945 +%global commit 86dc49aa137175378ac7fba7751c3d3e7f18e5fc %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 3+ -%global O4N_GIT_VERSION v3.3.0.30 +%global O4N_GIT_VERSION v3.3.1.3 %global K8S_GIT_VERSION v1.3.0-178-g52492b4 %global kube_version 1.3.0 %global kube_git_version v%{kube_version} @@ -60,7 +60,7 @@ Name: kubernetes Version: %{kube_version} -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.3.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -408,6 +408,10 @@ fi %systemd_postun %changelog +* Tue Nov 01 2016 jchaloup - 1.3.0-0.3.git86dc49a +- Update to ose v3.3.1.3 + resolves: #1390548 + * Wed Sep 07 2016 jchaloup - 1.3.0-0.2.gitc5ee292 - Fix permissions related: #1373884