From cde241e573a92e3897fc1ed9607c260b52815636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@intel.com>
Date: Wed, 28 Aug 2019 17:53:58 +0200
Subject: [PATCH] common: 1.5.2 release

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

diff --git a/ChangeLog b/ChangeLog
index 53e3ca504..42b1151d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-Fri Aug 09 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
+Wed Aug 28 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 
-	* Version 1.5.2-rc1
+	* Version 1.5.2
 
 	This release fixes possible pool corruptions on Windows
 	(see https://github.com/pmem/pmdk/pull/3728 for details),
@@ -22,6 +22,8 @@ Fri Aug 09 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 	- rpmem: lock file prior to unlink (#833)
 	- common: fix for pool_set error handling (#1036)
 	- pmreorder: fix handling of store drain flush drain pattern
+	- obj: fix possible memory leak in tx_add_lock
+	- pool: free bad_block vector
 	- common: fix bug in badblock file error handling
 	- obj: fix handling of malloc failures
 	- common: fix handling of malloc failures (ctl)
@@ -40,6 +42,9 @@ Fri Aug 09 2019 Marcin Åšlusarz <marcin.slusarz@intel.com>
 	- test: remove old log files for windows (#1013)
 	- test: remove invalid expect_normal_exit (#1092)
 	- test: suppress ld leak (#1098)
+	- test: fix failing pmemdetect on Windows
+	- test: fix match files in tests which use dax devices
+	- test: fix pmempool_check test
 
 Tue Feb 19 2018 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..4cda8f19e
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.5.2
-- 
GitLab