From 417e347ecb7aeea9116c3ca0cb55a80bbf97c08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Tue, 27 Aug 2019 17:43:26 +0200
Subject: [PATCH] common: 1.6.1 release

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

diff --git a/ChangeLog b/ChangeLog
index 2cbf7f2ac..6550100b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-Fri Aug 09 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
+Tue Aug 27 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 
-	* Version 1.6.1-rc1
+	* Version 1.6.1
 
 	This release fixes possible pool corruptions on Windows
 	(see https://github.com/pmem/pmdk/pull/3728 for details),
@@ -49,6 +49,9 @@ Fri Aug 09 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 	- test: avoid obj_critnib_mt taking very long on many-core machines
 	- test: deal with libndctl's path without build system
 	- test: overwrite old log in pmempool_create/TEST14.PS1
+	- test: fix match files in tests which use dax devices
+	- test: fix match file in rpmem_addr_ext test
+	- test: fix pmempool_check test
 
 Fri Aug 09 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 
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/VERSION b/VERSION
new file mode 100644
index 000000000..9c6d6293b
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.6.1
-- 
GitLab