summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--changelog.txt7
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 10 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3f87990fc..1173f43a0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org
GO ?= go
DESTDIR ?=
-EPOCH_TEST_COMMIT ?= 1faa5bb6cdddc2d4b36b1c25261952c9ccf90f61
+EPOCH_TEST_COMMIT ?= 2d8f1c8fda4d0a8b7c41addbc89f0b2f83908ec2
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index a3e1b474f..f539bec99 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+- Changelog for v1.7.0 (2020-01-06)
+ * (minor) fix broken links to container-policy.json.5
+ * Generate binaries only if they are changes in src code.
+ * Fix presentation of man page tables
+ * Bump gitvalidation epoch
+ * Bump to v1.7.0-dev
+
- Changelog for v1.7.0-rc2 (2020-01-02)
* Update release notes with further changes from 1.7.0
* refactor network commands
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 63f569a51..25c70c392 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -43,7 +43,7 @@
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman
-Version: 1.7.0
+Version: 1.7.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 e75d1e713..ee25517e7 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.7.0-dev"
+const Version = "1.7.1-dev"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility