summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--changelog.txt37
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 40 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0f66980fe..e7ea333f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
GO ?= go
-EPOCH_TEST_COMMIT ?= 8cb44e6a87526f8e6dd4b81381fbc670594d6b3d
+EPOCH_TEST_COMMIT ?= 1cbce851fa0315c147ba02afccd5a2899b5e5c5a
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 173c398bc..ee3e42a65 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,40 @@
+- 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
+ * Vendor in latest buildah code
+ * Update epoch to fix validation problems
+ * Touch up whitespace issue in build man
+ * Add disable-content flag info to man page for build
+ * podman-run: clean up some formatting issues
+ * Add pointers for Integration Tests to docs
+ * Remove SELinux transition rule after conmon is started.
+ * Add --all flag even though it is a noop so scripts will work
+ * Add support for BuildImage
+ * Added a defer to an Unlock that immediately followed a Lock
+ * varlink build fixes
+ * podman-varlink: log timeouts
+ * bash completion: remove shebang
+ * install.md: fix typo
+ * Vendor in latest buildah code
+ * Update OWNERS file to be based on reality
+ * Add logo to transfer page
+ * libpod: Execute poststop hooks locally
+ * Add some test for podman run flag security-opt
+ * Add a function for e2e test to write json file
+ * Use go-selinux for selinux check
+ * Add flag to add annotations to a container
+ * Want to change the log level on buildah by default to warnf
+ * vendor in latest github.com/varlink/go
+ * hooks: Add debug logging for initial hook loading
+ * hooks/docs: Fix 1.0.0 Nvidia example (adding version, etc.)
+ * hooks/1.0.0/when_test: Fix "both, and" -> "both, or" name typo
+ * hooks/1.0.0: Fix 'annotation' -> 'annotations' in JSON
+ * hooks: Fail ReadDir if a configured hook executable is missing
+ * Cleanup transfer.md page, remove CRI-O content
+ * Vendor in latest containers/storage
+ * Bump gitvalidation epoch
+ * Bump to v0.6.2-dev
+
- 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
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 426f7a1c2..0ef19adda 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.2
+Version: 0.6.3
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 53e135932..e7e446cad 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.2-dev"
+const Version = "0.6.3-dev"