summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-08-28 12:10:47 -0400
committerGitHub <noreply@github.com>2020-08-28 12:10:47 -0400
commit145a366d0f8cfd840855920b906b98c1988b7825 (patch)
tree5e571f01c4470896da78e5dfe6c249519a3e6aa3
parent538273e69618872dd182e8e87a3308deebef03c0 (diff)
parentdc006c164006351a5e3491c8f601318030c70dd4 (diff)
downloadpodman-145a366d0f8cfd840855920b906b98c1988b7825.tar.gz
podman-145a366d0f8cfd840855920b906b98c1988b7825.tar.bz2
podman-145a366d0f8cfd840855920b906b98c1988b7825.zip
Merge pull request #7488 from mheon/206_rc1
Bump to v2.0.6-rc1
-rw-r--r--RELEASE_NOTES.md7
-rw-r--r--changelog.txt12
2 files changed, 19 insertions, 0 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f4ee06d1d..814cfe4cd 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,12 @@
# Release Notes
+## 2.0.6
+### Bugfixes
+- Fixed a bug where running systemd in a container on a cgroups v1 system would fail.
+
+### Misc
+- Updated the containers/common library to v0.14.10
+
## 2.0.5
### Features
- Rootless Podman will now add an entry to `/etc/passwd` for the user who ran Podman if run with `--userns=keep-id`.
diff --git a/changelog.txt b/changelog.txt
index 199baef65..9dd24a8c6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,15 @@
+- Changelog for v2.0.6-rc1 (2020-08-28):
+ * Update release notes for v2.0.6
+ * Bump c/common to v0.14.10 and c/conmon to v2.0.20
+ * [CI:DOCS] Update podman-remote docs
+ * [CI:DOCS] Making docs build on mac
+ * abi: trim init command
+ * podman-remote fixes for msi and client
+ * Update c/storage to v1.20.3
+ * Revert "HACK: Disable build-each-commit"
+ * Revert "HACK: Manually include c/storage #698"
+ * run test: use explicit uid/gid
+
- Changelog for v2.0.5 (2020-08-24):
* HACK: Manually include c/storage #698
* Final release notes update for v2.0.5.