From f9fe9773ec1873b9476eda0c4d374cd286b085eb Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 22 May 2017 13:56:43 +0200
Subject: Merging upstream version 20170522.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CHANGELOG.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'CHANGELOG.txt')

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cc595a3..21fda43 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,11 @@
+2017-05-22	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20170522.
+
+	[ Daniel Baumann ]
+	* Correcting bind-ro option handling to actually work.
+	* Reverting "Purging packages that got removed/replaced during container creation.", not needed anymore.
+
 2017-05-10	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20170510.
-- 
cgit v1.2.3