Merge pull request #950 from mheon/bump-0.6.3

Bump to 0.6.3

4 files changed, 38 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index e7ea333f1..c6146933e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= 1cbce851fa0315c147ba02afccd5a2899b5e5c5a
+EPOCH_TEST_COMMIT ?= 16ea659757ad961d6d9ac3c95d9efbc1a426cef0
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index ee3e42a65..c74a3d388 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,38 @@
+- Changelog for v0.6.3 (2018-06-15)
+  * spec: remove dead code
+  * test: add test for running a rootless container
+  * container: specify path to error message
+  * podman: use a different store for the rootless case
+  * container: do not set any mapping when using a rootfs
+  * podman: do not use Chown in rootless mode
+  * network: do not attempt to create a network in rootless mode
+  * oci: do not set resources in rootless mode
+  * oci: do not use hooks in rootless mode
+  * oci: do not set the cgroup path in Rootless mode
+  * spec: change mount options for /dev/pts in rootless mode
+  * container: do not add shm in rootless mode
+  * oci: pass XDG_RUNTIME_DIR down to the OCI runtime
+  * podman: allow to override Tmpdir
+  * podman: provide a default UID mapping when non root
+  * podman: accept option --rootfs to use exploded images
+  * When setting a memory limit, also set a swap limit
+  * Fix cleaning up network namespaces on detached ctrs
+  * Vendor in latest projectatomic/buildah
+  * Temporarily turn of ps --last test until fixed
+  * Implement --latest for ps
+  * Correctly report errors retrieving containers in ps
+  * Doc changes to fix alignment on most of the docs
+  * Added --sort flag to podman image
+  * add podman container and image command
+  * Vendor in latest buildah code
+  * rmi: remove image if all tags are specified
+  * Aliases do not work with IsSet
+  * Touchups for registries.conf across a few man pages
+  * Remove container from state before cleaning up.
+  * hack/release.sh: Add a guard against -dev suffixes for argv[2]
+  * Bump gitvalidation epoch
+  * Bump to v0.6.3-dev
+
 - Changelog for v0.6.2 (2018-06-08)
   * Test to make sure we are getting proper exit codes on podman run
   * Propegate exit code on Exec calls and integrated test
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 0ef19adda..7ecdba703 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -51,7 +51,7 @@
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           podman
-Version:        0.6.3
+Version:        0.6.4
 Release:        #COMMITDATE#.git%{shortcommit}%{?dist}
 Summary:        Manage Pods, Containers and Container Images
 License:        ASL 2.0
diff --git a/version/version.go b/version/version.go
index e7e446cad..ea6f16b46 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // Version is the version of the build.
-const Version = "0.6.3-dev"
+const Version = "0.6.4-dev"