aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--changelog.txt9
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 12 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 98b7bbdfd..a5265653d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org
GO ?= go
DESTDIR ?=
-EPOCH_TEST_COMMIT ?= ac73fd3fe5dcbf2647d589f9c9f37fe9531ed663
+EPOCH_TEST_COMMIT ?= 76dd2bd1a0849af48a9eff117f69d3eaabf4b4d3
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 022e144af..4e8dc09db 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+- Changelog for v1.6.3 (2019-11-01):
+ * Update containers/buildah
+ * Update Cirrus branch info for new branch
+ * Add release notes for v1.6.3
+ * Update document formatting and packaging code
+ * Restructure documentation dir
+ * container start: fix regression when using name
+ * add libpod/config
+
- Changelog for v1.6.3-rc1 (2019-10-30)
* Wait for `mount` command to finish when mounting volume
* Cirrus: Fix upload_release_archive on branch or tag
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 8e0cb9950..33ecc8eba 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.3
+Version: 1.6.4
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 c0dbeadfe..129a2cd4b 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.3-dev"
+const Version = "1.6.4-dev"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility