diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-02 16:12:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 16:12:02 -0700 |
| commit | e67e9e123cde595b6f869b068f7f16e1b9fe1850 (patch) | |
| tree | c669b8a75bf1609554daf8c3280e2a5289033a62 | |
| parent | 960f07b0f79e6d6f94842fd4892e775c319f0a39 (diff) | |
| parent | 119bc9b6f8df3887f26b8b61d471c2a1d6335105 (diff) | |
| download | podman-e67e9e123cde595b6f869b068f7f16e1b9fe1850.tar.gz podman-e67e9e123cde595b6f869b068f7f16e1b9fe1850.tar.bz2 podman-e67e9e123cde595b6f869b068f7f16e1b9fe1850.zip | |
Merge pull request #4177 from mheon/bump-1.6.1
Bump to v1.6.1
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | changelog.txt | 7 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rw-r--r-- | version/version.go | 2 |
4 files changed, 10 insertions, 3 deletions
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go DESTDIR ?= -EPOCH_TEST_COMMIT ?= 257a985f5a7cff8f01891529ea89b0ea2800d61f +EPOCH_TEST_COMMIT ?= 960f07b0f79e6d6f94842fd4892e775c319f0a39 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD diff --git a/changelog.txt b/changelog.txt index 66f1dd1bb..8508d0d1c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +- Changelog for v1.6.1 (2019-10-02) + * Update release notes for v1.6.1 + * Bump gitvalidation epoch + * Bump to v1.6.1-dev + * rootless: allow cgroupfs manager on cgroups v2 + * system tests: reenable skipped tests + - Changelog for v1.6.1-rc1 (2019-10-02) * rootless: set DBUS_SESSION_BUS_ADDRESS if it is not set * install.md: add libbtrfs-dev for Debian build diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index dc734a6b4..bd2cff3f6 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 1.6.1 +Version: 1.6.2 Release: #COMMITDATE#.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 diff --git a/version/version.go b/version/version.go index 9fcd5faa7..2c4d69b78 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ package version // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -const Version = "1.6.1-dev" +const Version = "1.6.2-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility |