Skip to content

Commit

Permalink
Merge pull request containers#7787 from mheon/bump_211
Browse files Browse the repository at this point in the history
[CI:DOCS] Bump to v2.1.1
  • Loading branch information
openshift-merge-robot authored Sep 25, 2020
2 parents bb8e77d + 02457d1 commit ce5b48b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
18 changes: 18 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
- Changelog for v2.1.1 (2020-09-25):
* e2e tests: SkipIfRemote(): add a reason
* Examine all SkipIfRemote functions
* Update release notes for v2.1.1
* HTTP Attach: Wait until both STDIN and STDOUT finish
* Evict containers before removing via V2 API
* remote load: check if input is directory
* build: honor --runtime setting
* set interactive mode with compat create endpoint
* apiv2 container limit differ from docker-api
* Allow filtering on pod label values
* Remove final v2remotefail failures
* Fix a bug where log-driver json-file was made no logs
* add missing return for compat kill
* Include cgroup manager in `podman info` output
* Add Server header to API service responses
* podman save: fix redirect of multi-images

- Changelog for v2.1.0 (2020-09-22):
* Update release notes for v2.1.0 Final Release
* Fix up attach tests for podman remote
Expand Down
2 changes: 1 addition & 1 deletion contrib/spec/podman.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Epoch: 99
%else
Epoch: 0
%endif
Version: 2.1.1
Version: 2.1.2
Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
var Version = semver.MustParse("2.1.1-dev")
var Version = semver.MustParse("2.1.2-dev")

// APIVersion is the version for the remote
// client API. It is used to determine compatibility
Expand Down

0 comments on commit ce5b48b

Please sign in to comment.