Merge pull request #880 from mheon/bump-0.6.1

Bump to v0.6.1

4 files changed, 39 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index d54e6fd76..61fbab955 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= 1930f5d7093e84cdcc9e327e296f4733f32b20c8
+EPOCH_TEST_COMMIT ?= 96dc5fd0d5abb9a6edbc66a03c34b72958c14bb1
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 116de2cac..173c398bc 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,39 @@
+- Changelog for v0.6.1 (2018-06-01)
+  * hack/release.sh: Bump spec in dev_version_commit
+  * hack/release.sh: No longer need to bump setup.py
+  * Provide examples for python podman API
+  * Bump Buildah vendor to pick up fix for tests
+  * Log podman build failures in papr
+  * Use Version from spec file in setup.py
+  * Attempt to use fedora 28 atomic host
+  * Fix lable handling
+  * runtime: add /usr/libexec/podman/conmon to the conmon paths
+  * varlink build
+  * Add OnBuild support for podman build
+  * return all inspect info for varlink containerinspect
+  * hooks/exec: Allow successful reaps for 0s post-kill timeouts
+  * hack/release.sh: Add a release script
+  * Implement container attach
+  * If user specifies UIDMapSlice without GIDMapSlice, set them equal
+  * fix panic with podman pull
+  * pkg/hooks/exec: Add a new package for local hook execution
+  * Remove --net flag and make it an alias for --network
+  * Catch does not exist error
+  * hooks: Rename Hooks() output to extensionStageHooks
+  * hooks: Allow local control of OCI stages via extensionStages
+  * We need to change the SELinux label of the conmon process to s0
+  * Clear all caps, except the bounding set, when --user is specified.
+  * Makefile: Add stderr redirect to HAS_PYTHON3 definition
+  * Force update of API.md
+  * do not allow port related args to be used with --network=container:
+  * Update .gitignore for Varlink code and gopathok
+  * sort containers and images by create time
+  * Cleanup man pages
+  * add go generate varlink to copr spec
+  * Remove varlink's generated Go file
+  * Bump gitvalidation epoch
+  * Bump to v0.6.1-dev
+
 - Changelog for v0.5.4 (2018-05-25):
   * Vendor in latest projectatomic/buildah
   * Rename addFIPSsModeSecret to addFIPSModeSecret
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 542ce1850..426f7a1c2 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.1
+Version:        0.6.2
 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 439111111..53e135932 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.1-dev"
+const Version = "0.6.2-dev"