summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt7
-rw-r--r--version/version.go2
2 files changed, 8 insertions, 1 deletions
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/version/version.go b/version/version.go
index e75d1e713..dbd0b726b 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.0"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility