diff --git a/.gitignore b/.gitignore index 860be67..2f559cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /contrib-17c9a8d.tar.gz /kubernetes-52492b4.tar.gz /origin-884520c.tar.gz +/origin-2748423.tar.gz diff --git a/kubernetes.spec b/kubernetes.spec index a0280c5..9c0ccd2 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 884520c98e75d0f96e679959b28caf17f0e7fa29 +%global commit 274842360258d4f6ea1d3ec19559ecd395fd4d4f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global openshift_ip github.com/openshift/origin @@ -49,7 +49,7 @@ %global O4N_GIT_MAJOR_VERSION 1 %global O4N_GIT_MINOR_VERSION 3 -%global O4N_GIT_VERSION v1.3.0-rc1 +%global O4N_GIT_VERSION v1.3.1 %global K8S_GIT_VERSION v1.3.0-178-g52492b4 %global kube_version 1.3.0 %global kube_git_version v%{kube_version} @@ -61,7 +61,7 @@ Name: kubernetes Version: %{kube_version} -Release: 0.3.rc1.git%{k8s_shortcommit}%{?dist} +Release: 0.4.git%{k8s_shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -1076,6 +1076,10 @@ fi %systemd_postun %changelog +* Mon Oct 24 2016 jchaloup - 1.3.0-0.4.git52492b4 +- Update to origin v1.3.1 + resolves: #1388092 + * Thu Sep 08 2016 jchaloup - 1.3.0-0.3.rc1.git507d3a7 - Update to origin v1.3.0-rc1 resolves: #1374361 diff --git a/sources b/sources index c63b7fa..2ef949e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ bc0da49b010c7ac26b75e3606ef259dc contrib-17c9a8d.tar.gz e5792fe429d402a81f293916121d34fd kubernetes-52492b4.tar.gz -eeb9495c380550849ff1633633ab0827 origin-884520c.tar.gz +411abcbc692e76927ded8f24d1f909fd origin-2748423.tar.gz