diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-30 15:04:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 15:04:27 -0400 |
| commit | 148c9d6ccf084e495f24cf2a80c25ae183e232f4 (patch) | |
| tree | ff91b18fc355206df5ef80568688155b62eecb63 | |
| parent | 9911813c2282b71fb412756fe868e8fef6ec80b9 (diff) | |
| parent | 91f9682c7fd05f57ee203f4d318738ef26c662b2 (diff) | |
| download | podman-148c9d6ccf084e495f24cf2a80c25ae183e232f4.tar.gz podman-148c9d6ccf084e495f24cf2a80c25ae183e232f4.tar.bz2 podman-148c9d6ccf084e495f24cf2a80c25ae183e232f4.zip | |
Merge pull request #11817 from mheon/bump_340
[CI:DOCS] Bump to v3.4.0
| -rw-r--r-- | RELEASE_NOTES.md | 1 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rw-r--r-- | version/version.go | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 326991827..ef48df291 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -6,6 +6,7 @@ - Support for init containers has also been added to `podman play kube` and `podman generate kube` - init containers contained in Kubernetes YAML will be created as Podman init containers, and YAML generated by Podman will include any init containers created. - The `podman play kube` command now supports building images. If the `--build` option is given and a directory with the name of the specified image exists in the current working directory and contains a valid Containerfile or Dockerfile, the image will be built and used for the container. - The `podman play kube` command now supports a new option, `--teardown`, which removes any pods and containers created by the given Kubernetes YAML. +- The `podman generate kube` command now generates annotations for SELinux mount options on volume (`:z` and `:Z`) that are respected by the `podman play kube` command. - A new command has been added, `podman pod logs`, to return logs for all containers in a pod at the same time. - Two new commands have been added, `podman volume export` (to export a volume to a tar file) and `podman volume import`) (to populate a volume from a given tar file). - The `podman auto-update` command now supports simple rollbacks. If a container fails to start after an automatic update, it will be rolled back to the previous image and restarted again. diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index d59aaf1f9..0344c1776 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -36,7 +36,7 @@ Epoch: 99 %else Epoch: 0 %endif -Version: 3.4.0 +Version: 3.4.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 4bf446898..8500c64b8 100644 --- a/version/version.go +++ b/version/version.go @@ -27,7 +27,7 @@ const ( // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -var Version = semver.MustParse("3.4.0-dev") +var Version = semver.MustParse("3.4.1-dev") // See https://docs.docker.com/engine/api/v1.40/ // libpod compat handlers are expected to honor docker API versions |