--- a/CHANGELOG Tue Aug 21 04:05:12 2018 +0200
+++ b/CHANGELOG Tue Aug 21 04:08:38 2018 +0200
@@ -4,10 +4,12 @@
8.1.1 - in progress
-------------------
+ * evolve: properly set second parent during conflict (issue5927)
* next: fix topic restriction when passing --evolve
* clone: fix possible crash when using clone bundle and forcing cache warming
* obshashrange: fix speed and consistency issues during cache invalidation
* obshashrange: properly persist all caches involved in obshashrange discovery
+ * delete the evolvestate after aborting interrupted `next --evolve`
8.1.0 -- 2018-08-03
-------------------