summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-01 03:55:28 -0700
committerGitHub <noreply@github.com>2019-10-01 03:55:28 -0700
commit5d344db8d776190568df9c3b73fd22b632c9c135 (patch)
treec4e69521ca5b52f5435f041f981e56eb4871fef7
parentd7eba026876e4a6a362464dcf08fe6757ebedd1a (diff)
parentd74fb433a86d52c684983bc792de764e2884bcc4 (diff)
downloadpodman-5d344db8d776190568df9c3b73fd22b632c9c135.tar.gz
podman-5d344db8d776190568df9c3b73fd22b632c9c135.tar.bz2
podman-5d344db8d776190568df9c3b73fd22b632c9c135.zip
Merge pull request #4155 from mheon/bump-1.6.0
Bump to v1.6.0
-rw-r--r--Makefile2
-rw-r--r--changelog.txt41
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 44 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b8d835f5d..e35264a74 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org
GO ?= go
DESTDIR ?=
-EPOCH_TEST_COMMIT ?= 0000afc1af06b04ececeb91637bb3d80d6f47e14
+EPOCH_TEST_COMMIT ?= d7eba026876e4a6a362464dcf08fe6757ebedd1a
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 1e9d17d06..7d6522c4d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,44 @@
+- Changelog for v1.6.0 (2019-09-30)
+ * info: add cgroups2
+ * Finalize release notes for 1.6.0 final
+ * Bump github.com/onsi/ginkgo from 1.8.0 to 1.10.1
+ * Bump github.com/docker/docker-credential-helpers from 0.6.2 to 0.6.3
+ * Bump github.com/stretchr/testify from 1.3.0 to 1.4.0
+ * Bump github.com/uber/jaeger-client-go
+ * Bump github.com/spf13/pflag from 1.0.3 to 1.0.5
+ * update c/storage to v1.13.4
+ * Cirrus: Minor, fix env. var. intention
+ * new examples added updated two examples with supported CMD and ENTRYPOINT syntax.
+ * new testcase for podman import --change added
+ * syntax updated for podman import --change
+ * Correct use of reexec.Init()
+ * Add a missing escape in the Makefile
+ * Change ginkgo Wait() to Eventually() test
+ * Set log-level immediately, before rootless setup
+ * Cirrus: Implement newly built VM images
+ * Add README note about security reporting process.
+ * Cirrus: Disable boottime Ubuntu package update
+ * Move noCache logic lower in stack
+ * cirrus: Add bash-completion support
+ * Add an error for pods without a name
+ * Make links relative in Tutorial README
+ * docs/podman-derivative-api.md: New file
+ * fix cp none exists dest path ends with '/'
+ * Dockerfile.fedora: install packages to build catatonit
+ * README: add Communications section
+ * drop OWNERS link for CONTRIBUTING.md
+ * Bump gitvalidation epoch
+ * Bump to v1.6.0-dev
+ * Handle conflict between volumes and --read-only-tmpfs
+ * Cirrus: Upload windows MSI release file
+ * conditionally send stdin on remote run
+ * Cirrus: VM Image accounting doc update
+ * Force a CNI Delete on refreshing containers
+ * Document the required varlink build args
+ * Update mac_client link
+ * Cirrus: Fail early on CI script unit test
+ * Unconditionally remove conmon files before starting
+
- Changelog for v1.6.0-rc2 (2019-09-24)
* Add release notes for new-in-RC2 changes
* system tests: run test: reenable and fix
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 6ac324499..dc734a6b4 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.6.0
+Version: 1.6.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 348a69594..9fcd5faa7 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.6.0-dev"
+const Version = "1.6.1-dev"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility