summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt26
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
3 files changed, 28 insertions, 2 deletions
diff --git a/changelog.txt b/changelog.txt
index bc141cceb..b0680a02c 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,29 @@
+- Changelog for v0.12.1.2 (2018-12-13)
+ * Add release notes for 0.12.1.2
+ * runlabel should sub podman for docker|/usr/bin/docker
+ * condition fixed for adding volume to boltdb.
+ * e2e: add tests for systemd
+ * Add test for sharing resolv and hosts with netns
+ * Makefile tweaks to fix make shell
+ * failed containers with --rm should remove themselves
+ * Fix documentation links and flow
+ * Set Socket label for contianer
+ * Containers sharing a netns should share resolv/hosts
+ * Prevent a second lookup of user for image volumes
+ * fix typo in kubernetes
+ * No need to use `-i` in go build (with go 1.10 and above)
+ * rootless: fix restart when using fuse-overlayfs
+ * Cirrus: Update base-image build docs
+ * Add capabilities to generate kube
+ * disable F29 tests on PAPR
+ * Ensure storage options are properly initialized
+ * add more example usage to varlink endpoints
+ * Update for API change
+ * Vendor buildah after merging mtrmac/blob-info-caching-on-top-of-contents-caching
+ * Vendor c/image after merging c/image#536
+ * Bump gitvalidation epoch
+ * Bump to v0.12.2-dev
+
- Changelog for v0.12.1.1 (2018-12-07)
* Update release notes for v0.12.1.1
* Fix errors where OCI hooks directory does not exist
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 20e2a84ea..35834bd86 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.12.2
+Version: 0.12.1.2
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 45dc93d91..1f7c47e7b 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.12.2-dev"
+const Version = "0.12.1.2"