diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-17 23:02:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-17 23:02:40 +0200 |
| commit | b6fdfa041a3e0f0a754c1f3a6edd8bc0be6f6ed8 (patch) | |
| tree | be4fa783e8fb098b5637e564b021d67fced188b7 | |
| parent | 2b0892e757c878cdb087dd22b8986bccef0276ed (diff) | |
| parent | e2ddfd704b849e94645dbd4c37a9c26bc2a30cf7 (diff) | |
| download | podman-b6fdfa041a3e0f0a754c1f3a6edd8bc0be6f6ed8.tar.gz podman-b6fdfa041a3e0f0a754c1f3a6edd8bc0be6f6ed8.tar.bz2 podman-b6fdfa041a3e0f0a754c1f3a6edd8bc0be6f6ed8.zip | |
Merge pull request #4292 from mheon/bump-1.6.2
Bump to v1.6.2
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | changelog.txt | 8 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rw-r--r-- | version/version.go | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go DESTDIR ?= -EPOCH_TEST_COMMIT ?= dc1f8b62b168e0815ed5e7eb7c61a26ec3a0c88c +EPOCH_TEST_COMMIT ?= 2b0892e757c878cdb087dd22b8986bccef0276ed HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD diff --git a/changelog.txt b/changelog.txt index dd3fcec82..615e2a135 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +- Changelog for v1.6.2 (2019-10-17) + * Finalize release notes for v1.6.2 + * rootless: drop dependency on docker + * Bump gitvalidation epoch + * Bump to v1.6.2-dev + * Refactor tests when checking for error exit codes + * Attach stdin to container at start if it was created with --interactive + - Changelog for v1.6.2-rc1 (2019-10-16) * Add release notes for Podman 1.6.2 * start: print full container ID diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index bd2cff3f6..d5247f689 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.2 +Version: 1.6.3 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 2c4d69b78..c0dbeadfe 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.2-dev" +const Version = "1.6.3-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility |