Merge pull request #1343 from mheon/bump-0.8.4

Bump to 0.8.4

4 files changed, 50 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index e69e9e26b..6f7bf7537 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GO ?= go
 DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 33f95b9ef82e48bd8350f6327292e55004bd6013
+EPOCH_TEST_COMMIT ?= 717b038911d1904b056113cc5a7d13b22f5ef4ce
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 0f4698051..ba0021058 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,50 @@
+- Changelog for v0.8.4 (2018-08-24)
+  * Add release notes
+  * Regenerate easyjson after rebase
+  * Vendor easyjson code to fix build
+  * Swap from FFJSON to easyjson
+  * Make 'make clean' remove FFJSON generated code
+  * rootless: allow to override policy.json by the user
+  * add completion for --pod in run and create
+  * Fixed formatting and lowered verbosity of pod ps
+  * Do not try to enable AppArmor in rootless mode
+  * exposes tcp port only if no proto specified.
+  * rpm-spec: use skopeo-containers instead of containers-common
+  * Reveal information about container capabilities
+  * Vendor in latest projectatomic/buildah
+  * Refactor error checking in With*NSFromPod options
+  * Fixing network ns segfault
+  * Change pause container to infra container
+  * Support pause containers in varlink
+  * Added option to share kernel namespaces in libpod and podman
+  * Changed GetContainerStats to return ErrCtrStateInvalid
+  * Add GetPodStats to varlink
+  * rpm-spec: update distro-specific dependencies
+  * Add podman pod top
+  * Include pod stats and top in commands/completions
+  * Vendor changes to psgo
+  * Fix syntax description of --ulimit command
+  * Swap test image in exec test to fedora for useradd
+  * Add tests for exec --user
+  * Properly translate users into runc format for exec
+  * test: ad more tests for rootless containers
+  * rootless: fix --net host --privileged
+  * Fix a bug with hook ALWAYS matching with a process
+  * Fixed segfault in stats where container had netNS none or from container
+  * Enable pod stats with short ID and name
+  * Touch up cert-dir in man pages
+  * make dbuild fixed on ubuntu/debian
+  * vendor latest github.com/urfave/cli
+  * Add retry decorator for flakey tests
+  * Update error message from reviews
+  * Support Attach subcommand in pypodman
+  * Fix handling of devices
+  * tutorial: point to containers/skopeo
+  * point to containers/skopeo
+  * install.md:  point to containers/libpod
+  * Bump gitvalidation epoch
+  * Bump to v0.8.4-dev
+
 - Changelog for v0.8.3 (2018-08-17)
   * Make failure to retrieve individual ctrs/pods nonfatal
   * Mention that systemd is the default cgroup manager
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 64b27a5a0..b5b22a3c5 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -33,7 +33,7 @@
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:8})
 
 Name: podman
-Version: 0.8.4
+Version: 0.8.5
 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 5dfd6cc5a..f96b7c63a 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.8.4-dev"
+const Version = "0.8.5-dev"