From d9a41b85188e10afc3caff696e5d923b6d64ceed Mon Sep 17 00:00:00 2001 From: Ashley Cui <acui@redhat.com> Date: Mon, 27 Sep 2021 21:46:00 -0400 Subject: [PATCH] Bump to v1.23.1 [NO TESTS NEEDED] Signed-off-by: Ashley Cui <acui@redhat.com> --- CHANGELOG.md | 5 +++++ changelog.txt | 4 ++++ contrib/rpm/buildah.spec | 6 +++++- define/types.go | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1864a45649b..685c4f4d36a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ # Changelog +## v1.23.1 (2021-09-27) + + Vendor containers/common v0.44.2 + post-1.23 branch fixups + ## v1.23.0 (2021-09-13) Vendor in containers/common v0.44.0 diff --git a/changelog.txt b/changelog.txt index 24a1010168d..8926b2e6f37 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +- Changelog for v1.23.1 (2021-09-27) + * Vendor containers/common v0.44.2 + * post-1.23 branch fixups + - Changelog for v1.23.0 (2021-09-13) * Vendor in containers/common v0.44.0 * build(deps): bump github.com/containers/storage from 1.35.0 to 1.36.0 diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec index 4b788af39ff..79ed573b1af 100644 --- a/contrib/rpm/buildah.spec +++ b/contrib/rpm/buildah.spec @@ -26,7 +26,7 @@ Name: buildah # Bump version in define/types.go too -Version: 1.23.0 +Version: 1.23.1 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -100,6 +100,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/* %changelog +* Mon Sep 27, 2021 Ashley Cui <acui@redhat.com> 1.23.1-1 +- Vendor containers/common v0.44.2 +- post-1.23 branch fixups + * Mon Sep 13, 2021 Daniel J Walsh <dwalsh@redhat.com> 1.23.0-1 - Vendor in containers/common v0.44.0 - build(deps): bump github.com/containers/storage from 1.35.0 to 1.36.0 diff --git a/define/types.go b/define/types.go index fc56aeef8ba..4f3ebf01a49 100644 --- a/define/types.go +++ b/define/types.go @@ -29,7 +29,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.23.0" + Version = "1.23.1" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc"