diff --git a/.tito/packages/atomic-openshift b/.tito/packages/atomic-openshift index f29a0635f223..97e60ddf575e 100644 --- a/.tito/packages/atomic-openshift +++ b/.tito/packages/atomic-openshift @@ -1 +1 @@ -3.2.0.43 ./ +3.2.0.44 ./ diff --git a/origin.spec b/origin.spec index 754e2642986f..33b47bee6895 100644 --- a/origin.spec +++ b/origin.spec @@ -21,12 +21,12 @@ # %commit and %ldflags are intended to be set by tito custom builders provided # in the .tito/lib directory. The values in this spec file will not be kept up to date. %{!?commit: -%global commit a286b42e6fbc9f3b70bfc0b07b047715acdf60fe +%global commit b8dfa089312e4a60fb65f506fe7a282ea9bd2077 } %global shortcommit %(c=%{commit}; echo ${c:0:7}) # ldflags from hack/common.sh os::build:ldflags %{!?ldflags: -%global ldflags -X github.com/openshift/origin/pkg/version.majorFromGit 3 -X github.com/openshift/origin/pkg/version.minorFromGit 2+ -X github.com/openshift/origin/pkg/version.versionFromGit v3.2.0.42-2-g712b2b4 -X github.com/openshift/origin/pkg/version.commitFromGit 712b2b4 -X k8s.io/kubernetes/pkg/version.gitCommit 712b2b4 -X k8s.io/kubernetes/pkg/version.gitVersion v1.2.0-36-g4a3f9c5 +%global ldflags -X github.com/openshift/origin/pkg/version.majorFromGit 3 -X github.com/openshift/origin/pkg/version.minorFromGit 2+ -X github.com/openshift/origin/pkg/version.versionFromGit v3.2.0.43-2-g1743f3b -X github.com/openshift/origin/pkg/version.commitFromGit 1743f3b -X k8s.io/kubernetes/pkg/version.gitCommit 1743f3b -X k8s.io/kubernetes/pkg/version.gitVersion v1.2.0-36-g4a3f9c5 } %if 0%{?fedora} || 0%{?epel} @@ -46,7 +46,7 @@ Name: atomic-openshift # Version is not kept up to date and is intended to be set by tito custom # builders provided in the .tito/lib directory of this project -Version: 3.2.0.43 +Version: 3.2.0.44 Release: 1%{?dist} Summary: Open Source Container Management by Red Hat License: ASL 2.0 @@ -485,6 +485,9 @@ fi %changelog +* Wed May 11 2016 Troy Dawson 3.2.0.44 +- Check for pod creation in scc exec admission (jliggitt@redhat.com) + * Mon May 09 2016 Troy Dawson 3.2.0.43 - UPSTREAM: 25077: PLEG: reinspect pods that failed prior inspections (agoldste@redhat.com)