summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt18
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
3 files changed, 20 insertions, 2 deletions
diff --git a/changelog.txt b/changelog.txt
index a31cd26e9..67120b8f4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,21 @@
+- Changelog for v0.10.1.1 (2018-10-16)
+ * Update release notes for 0.10.1.1
+ * Mount proper cgroup for systemd to manage inside of the container.
+ * Cirrus: Enable debugging delay on non-zero exit
+ * Touchup fileo typo
+ * volume: resolve symlinks in paths
+ * volume: write the correct ID of the container in error messages
+ * vendor: update containers/buildah
+ * papr: relabel GOPATH/github.com/containers/libpod
+ * tests: do not fail in the cleanup phase
+ * tests: do not make assumptions on the mount output
+ * papr_prepare: remove double process for starting up .papr.sh
+ * Add support for pod commands
+ * Support auth file environment variable & add change to man pages
+ * Generate a passwd file for users not in container
+ * Bump gitvalidation epoch
+ * Bump to v0.10.2-dev
+
- Changelog for v0.10.1 (2018-10-11)
* Swap from map to channels for podman stop workers
* Add release notes for 0.10.1
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index c2d8fc59d..b3cca1b1b 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: 0.10.2
+Version: 0.10.1.1
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 0fd4e5aeb..d7bed93c5 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,4 +4,4 @@ package version
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
-const Version = "0.10.2-dev"
+const Version = "0.10.1.1"