Skip to content

Commit

Permalink
Automatic commit of package [atomic-openshift] release [3.2.0.44].
Browse files Browse the repository at this point in the history
  • Loading branch information
tdawson committed May 11, 2016
1 parent 1743f3b commit a4463d9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .tito/packages/atomic-openshift
@@ -1 +1 @@
3.2.0.43 ./
3.2.0.44 ./
9 changes: 6 additions & 3 deletions origin.spec
Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -485,6 +485,9 @@ fi


%changelog
* Wed May 11 2016 Troy Dawson <tdawson@redhat.com> 3.2.0.44
- Check for pod creation in scc exec admission (jliggitt@redhat.com)

* Mon May 09 2016 Troy Dawson <tdawson@redhat.com> 3.2.0.43
- UPSTREAM: 25077: PLEG: reinspect pods that failed prior inspections
(agoldste@redhat.com)
Expand Down

0 comments on commit a4463d9

Please sign in to comment.