Skip to content

Commit

Permalink
Merge pull request #3547 from ashley-cui/bump-1.23.1
Browse files Browse the repository at this point in the history
[v1.23] Bump 1.23.1
  • Loading branch information
openshift-merge-robot authored Sep 28, 2021
2 parents 3b96771 + d9a41b8 commit 87a0565
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion contrib/rpm/buildah.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -100,6 +100,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
%{_datadir}/bash-completion/completions/*

%changelog
* Mon Sep 27, 2021 Ashley Cui <[email protected]> 1.23.1-1
- Vendor containers/common v0.44.2
- post-1.23 branch fixups

* Mon Sep 13, 2021 Daniel J Walsh <[email protected]> 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
Expand Down
2 changes: 1 addition & 1 deletion define/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 87a0565

Please sign in to comment.