summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-17 01:20:58 +0200
committerGitHub <noreply@github.com>2019-05-17 01:20:58 +0200
commit1b0b738bef0c0a47a1c1d1989c4a0857037e378b (patch)
treede645bf6968e7cf2618ae56fa8b16cdb1d89185a
parente2cd3d2eec0124ffe2097cfbe40f5956e1e7b5ca (diff)
parenta61ebf04461f814e52635c87f9ddfa8fec1eb010 (diff)
downloadpodman-1b0b738bef0c0a47a1c1d1989c4a0857037e378b.tar.gz
podman-1b0b738bef0c0a47a1c1d1989c4a0857037e378b.tar.bz2
podman-1b0b738bef0c0a47a1c1d1989c4a0857037e378b.zip
Merge pull request #3140 from mheon/bump-1.3.1
Bump to v1.3.1
-rw-r--r--Makefile2
-rw-r--r--changelog.txt45
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 48 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 10de8ad4e..f73aff2e9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= a9fc570dd844bf1ebd1f106f1b8091882b4a2b29
+EPOCH_TEST_COMMIT ?= 8161802f7df857e0850f842261079c83290f9891
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index c72117d7f..ec0a62f26 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,48 @@
+- Changelog for v1.3.1 (2019-05-16)
+ * More release notes
+ * Add unshare to podman
+ * Release notes for 1.3.1
+ * Kill os.Exit() in tests, replace with asserts
+ * Minor capitalization fix in Readme
+ * Add debug mode to Ginkgo, collect debug logs in Cirrus
+ * set default event logger based on build tags
+ * Add VarlinkCall.RequiresUpgrade() type and method
+ * Ensure that start() in StartAndAttach() is locked
+ * When removing pods, free their locks
+ * network: raise a clearer error when using CNI
+ * Fix libpod.conf option ordering
+ * split remote tests from distro tests
+ * varlink: fix usage message, URI is now optional
+ * Update containerd/cgroups to 4994991857f9b0ae
+ * healthcheck benign error
+ * Add `systemd` build tag
+ * podman: fix events help string
+ * When removing a pod with CGroupfs, set pids limit to 0
+ * Add fix for an issue breaking our CI
+ * Use standard remove functions for removing pod ctrs
+ * implement cp reads tar file from stdin/stdout
+ * Add information when running podman version on client
+ * add varlink bridge
+ * Add negative command-line test
+ * Preserve errors returned by removing pods
+ * Improve robustness of pod removal
+ * enable integration tests for remote-client
+ * fix podman-remote ps --ns
+ * podman-run|create man updates
+ * Update installation instructions
+ * remote-podman checkpoint and restore add to container submenu
+ * Remove tests for deprecated podman-refresh command
+ * When refreshing after a reboot, force lock allocation
+ * Do not remove volumes when --rm removes a container
+ * add unit tests for generate systemd
+ * Bump gitvalidation epoch
+ * Bump to v1.3.1-dev
+ * Upgrade to latest criu and selinux-policy
+ * Only run checkpoint/restore tests on Fedora >= 29
+ * Fix API.md
+ * Cirrus: Add missing task dependencies
+ * Cirrus: Add check for make varlink_api_generate
+
- Changelog for v1.3.0 (2019-05-06)
* Update release notes for 1.3.0 release
* Bump to Buildah v1.8.2
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 29c786ca6..5e5789cf5 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.3.1
+Version: 1.3.2
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 c63f8b820..a917931b7 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.3.1-dev"
+const Version = "1.3.2-dev"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility