summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-02 21:48:03 +0100
committerGitHub <noreply@github.com>2020-01-02 21:48:03 +0100
commit50b44463760a224cd72e0920f03ed2041689bc63 (patch)
tree384025ee8341d02432a141b4bb048b1587ac54fa
parent1faa5bb6cdddc2d4b36b1c25261952c9ccf90f61 (diff)
parent13bff7719eabe2e033c9a077dafbc0748c9a70c8 (diff)
downloadpodman-50b44463760a224cd72e0920f03ed2041689bc63.tar.gz
podman-50b44463760a224cd72e0920f03ed2041689bc63.tar.bz2
podman-50b44463760a224cd72e0920f03ed2041689bc63.zip
Merge pull request #4777 from mheon/bump-1.7.0-rc2
Bump to v1.7.0-RC2
-rw-r--r--Makefile2
-rw-r--r--changelog.txt40
2 files changed, 41 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 32da41ef7..a9f1d17ba 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org
GO ?= go
DESTDIR ?=
-EPOCH_TEST_COMMIT ?= 11541aec80c0fc588f675decd0ce759a4e353684
+EPOCH_TEST_COMMIT ?= 1faa5bb6cdddc2d4b36b1c25261952c9ccf90f61
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index a19c23934..a3e1b474f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,43 @@
+- Changelog for v1.7.0-rc2 (2020-01-02)
+ * Update release notes with further changes from 1.7.0
+ * refactor network commands
+ * Fix race condition in kill test leading to hang
+ * Ensure 'make uninstall' remove bin and conf files.
+ * Add the pod name when we use `podman ps -p`
+ * Ensure SizeRw is shown when a user does 'inspect --size -t container'.
+ * signal parsing - better input validation
+ * The --quiet flag does not conflict with templates in ps
+ * add struct response for removal of images
+ * Update containers/storage to v1.15.4
+ * Update containers/storage to v1.15.4
+ * zsh completion: ignore multi-line output in Flags
+ * build(deps): bump github.com/containers/image/v5 from 5.0.0 to 5.1.0
+ * if container is not in a pid namespace, stop all processes
+ * update c/buildah to v1.12.0
+ * Remove volumes after containers in pod remove
+ * libpod: drop arbitrary memory limit of 4M
+ * docs: add workaround for --device with rootless containers
+ * install.md: openSUSE dependencies
+ * Use systemd/sd-daemon.h headers for systemd presence
+ * Allow the injection of TESTFLAGS
+ * Remove coverprofile from the repository
+ * troubleshooting.md: rebased master and bumped 18 to 19
+ * Fix F30-F31 migration for Podman 1.7.0
+ * runtime.go: show registries data and search table
+ * container config: add CreateCommand
+ * Fixed the path of hack scripts in spec file
+ * runtime.go: show search table in podman info
+ * podman info man: example update
+ * podman: mirror information
+ * Reap exec sessions on cleanup and removal
+ * [Makefile] `LDFLAGS` is reserved for the GCC linker
+ * podman images history test - clean up
+ * Bump gitvalidation epoch
+ * Bump to v1.7.0-dev
+ * allow exec to read files of environment variables
+ * Correctly export the root file-system changes
+ * build(deps): bump github.com/uber/jaeger-client-go
+
- Changelog for v1.7.0-rc1 (2019-12-11)
* Update release notes for 1.7.0
* docs: update podman-{pod-,}top man pages