diff CHANGELOG @ 3175:00b003ebb873

branching: merge stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 07 Nov 2017 13:04:58 +0100
parents d56b8f5f0bb1
children f4ba7d662c4c
line wrap: on
line diff
--- a/CHANGELOG	Thu Nov 02 00:48:25 2017 +0100
+++ b/CHANGELOG	Tue Nov 07 13:04:58 2017 +0100
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+7.0.1 - in progress
+-------------------
+
+  * obsdiscovery: allow the config option to disable discovery server side
+    (it was previously only honored on the client side)
+
+  * server: avoid exposing 'abort' to evolution enabled client talking
+            to server with the extension bu obsolescence marker exchange
+            disabled.
+
 7.0.0 -- 2017-10-23
 -------------------