From bc5e309485df61c452d08367e4b13ba9dfed5071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Mon, 30 Sep 2019 18:57:30 +0200
Subject: [PATCH] common: 1.7 release

---
 ChangeLog   | 7 ++++---
 GIT_VERSION | 1 -
 README.md   | 4 ++--
 VERSION     | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 GIT_VERSION
 create mode 100644 VERSION

diff --git a/ChangeLog b/ChangeLog
index 758f425f7..a5708d724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,13 @@
-Thu Sep 26 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
+Mon Sep 30 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 
-	* Version 1.7-rc2
+	* Version 1.7
 
 	This release:
 	- Introduces new APIs in libpmemobj for managing space used by transactions.
 	  (see pmemobj_tx_log_append_buffer man page for details)
 	- Introduces new APIs in librpmem, splitting rpmem_persist into rpmem_flush
 	  and rpmem_drain, allowing applications to use the flush + drain model
-	  used by libpmem and libpmemobj.
+	  already known from libpmem. (libpmemobj does not use this feature yet)
 	- Optimizes large libpmemobj transactions by significantly reducing
 	  the amount of memory modified at the commit phase.
 	- Optimizes tracking of libpmemobj reservations.
@@ -22,6 +22,7 @@ Thu Sep 26 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 	Other changes:
 	- obj: fix merging of ranges when NOFLUSH flag is used (#1100)
 	- rpmem: fix closing of ssh connection (#995, #1060)
+	- obj: abort transaction on pmemobj_tx_publish failure
 
 	Internal changes:
 	- test: fault injection tests for pmemblk, pmemlog, and pmemobj
diff --git a/GIT_VERSION b/GIT_VERSION
deleted file mode 100644
index f59cc05cb..000000000
--- a/GIT_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-$Format:%h %d$
\ No newline at end of file
diff --git a/README.md b/README.md
index 4c7028a5f..9f972b8a8 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/u2l1db7ucl5ktq10/branch/master?svg=true&pr=false)](https://ci.appveyor.com/project/pmem/pmdk/branch/master)
 [![Build status](https://api.cirrus-ci.com/github/pmem/pmdk.svg)](https://cirrus-ci.com/github/pmem/pmdk/master)
 [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/3015.svg)](https://scan.coverity.com/projects/pmem-pmdk)
-[![PMDK release version](https://img.shields.io/github/release/pmem/pmdk.svg?sort=semver)](https://github.com/pmem/pmdk/releases/1.6.1)
+[![PMDK release version](https://img.shields.io/github/release/pmem/pmdk.svg?sort=semver)](https://github.com/pmem/pmdk/releases/latest)
 [![Coverage Status](https://codecov.io/github/pmem/pmdk/coverage.svg?branch=master)](https://codecov.io/gh/pmem/pmdk/branch/master)
 
 The **Persistent Memory Development Kit (PMDK)** is a collection of libraries and tools for System Administrators and Application Developers to simplify managing and accessing persistent memory devices. For more information, see http://pmem.io.
@@ -164,7 +164,7 @@ To build from source, clone this tree:
 
 For a stable version, checkout a [release tag](https://github.com/pmem/pmdk/releases) as follows. Otherwise skip this step to build the latest development release.
 ```
-	$ git checkout tags/1.6.1
+	$ git checkout tags/1.7
 ```
 
 Once the build system is setup, the Persistent Memory Development Kit is built using the `make` command at the top level:
diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..d3bdbdf1f
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.7
-- 
GitLab