summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-03-04 19:34:04 -0500
committerMatthew Heon <matthew.heon@pm.me>2019-03-04 19:34:04 -0500
commit0ad9b6bf2aea4ba37e8c9738feabec61343ba175 (patch)
tree9d60f66b50d7dd704c88ca82b0754982096a13db
parent4b80517b6a638ff06f8ad432f0f0f5839283d058 (diff)
downloadpodman-1.1.2.tar.gz
podman-1.1.2.tar.bz2
podman-1.1.2.zip
Bump to v1.1.2v1.1.2
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--changelog.txt17
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
3 files changed, 19 insertions, 2 deletions
diff --git a/changelog.txt b/changelog.txt
index 9dd0ae2d1..7db579f3a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,20 @@
+- Changelog for v1.1.2 (2019-03-04)
+ * Fix #2521
+ * Update release notes for v1.1.2
+ * Change timestamp format for podman logs
+ * Don't extract tar file in podman cp
+ * runtime: fill a proper default tmpdir when --config is used
+ * Add additional defense against 0-length log segfaults
+ * When logging with timestamps, append only until newline
+ * Ensure that each log line is newline-terminated
+ * A few more usage-message tweaks
+ * Add missing short flag -l for run/create
+ * Fix aliased commands to actually work
+ * Support podman-remote stop container(s)
+ * Add tests to make sure podman container and podman image commands work
+ * Bump gitvalidation epoch
+ * Bump to v1.2.0-dev
+
- Changelog for v1.1.1 (2019-03-01)
* Update release notes for v1.1.1
* Pull image for runlabel if not local
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 703b942b6..4787bbef7 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: 1.2.0
+Version: 1.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 89b5fbd8b..56b61b0f0 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,7 +4,7 @@ package version
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
-const Version = "1.2.0-dev"
+const Version = "1.1.2"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility