diff CHANGELOG @ 3176:1b58e0121689 mercurial-4.3

test-compat: merge stable into mercurial-4.3

--- a/CHANGELOG	Wed Nov 01 23:57:56 2017 +0100
+++ b/CHANGELOG	Tue Nov 07 13:05:37 2017 +0100
@@ -1,22 +1,32 @@
 Changelog
 =========
 
-7.0.0 - in progress
+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
 -------------------
 
   * drop compatibility with Mercurial 3.8, 3.9 and 4.0,
   * drop support for old and deprecated method to exchange obsmarkers,
   * forbid usage of the old pushbey based protocol to exchange obsmarkers,
-  * evolve: rename '--contentdivergent' flag to '--content-divergent'
-  * evolve: rename '--phasedivergent' flag to '--phase-divergent'
+  * evolve: rename '--contentdivergent' flag to '--content-divergent',
+  * evolve: rename '--phasedivergent' flag to '--phase-divergent'.
 
-topic
+topic (0.5.0)
 
   * add an experimental flag to enforce one head per name policy,
     (off by default, see 'hg help -e topic' for details)
   * add an experimental flag to have changesets without topic published on push,
     (off by default, see 'hg help -e topic' for details)
-  * add a '--publish' flag to `hg push` (4.4+ only),
+  * add a '--publish' flag to `hg push` (4.4+ only).
 
 6.8.0 -- 2017-10-23
 -------------------