summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-15 17:53:47 +0200
committerGitHub <noreply@github.com>2020-04-15 17:53:47 +0200
commitcc9b78f07ca9941260b74ad07f3b94357e138286 (patch)
treefdb00c270695d40b9a1a2acb6116b9e742d1ff1a
parent37ed662f323ef4700ae14d441fb2264a59960baa (diff)
parent4489440aaf82496641c765c3980500969bc8eceb (diff)
downloadpodman-cc9b78f07ca9941260b74ad07f3b94357e138286.tar.gz
podman-cc9b78f07ca9941260b74ad07f3b94357e138286.tar.bz2
podman-cc9b78f07ca9941260b74ad07f3b94357e138286.zip
Merge pull request #5820 from mheon/bump-1.9.0
Bump to v1.9.0
-rw-r--r--changelog.txt7
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
3 files changed, 9 insertions, 2 deletions
diff --git a/changelog.txt b/changelog.txt
index 3d0d431d2..95f8d5b47 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+- Changelog for v1.9.0 (2020-04-15)
+ * podmanV2: fix nil deref
+ * v2specgen prune libpod
+ * More system test fixes on regressions
+ * Add support for the global flags and config files
+ * Bump to v1.9.0-dev
+
- Changelog for v1.9.0-rc2 (2020-04-14)
* Update release notes for v1.9.0-RC2
* v2podman ps revert structure changes
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index a63c15940..afc50f854 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -48,7 +48,7 @@ Epoch: 99
%else
Epoch: 0
%endif
-Version: 1.9.0
+Version: 2.0.0
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 06457e3ea..fe602d8e1 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.9.0-dev"
+const Version = "2.0.0-dev"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility