From 3f95dcdf41b680ffd0e867ede376b1bb26a63fb5 Mon Sep 17 00:00:00 2001
From: Andreas Streichardt <andreas@arangodb.com>
Date: Tue, 18 Apr 2017 12:06:02 +0200
Subject: [PATCH] Add changelog from 3.1

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e7fc3471dd..984fa4037b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -178,6 +178,10 @@ v3.2.alpha1 (2017-02-05)
 v3.1.18 (2017-XX-XX)
 --------------------
 
+* better error messages during restore collection
+
+* Completely overhaul supervision. More detailed tests
+
 * Fixed a dead-lock situation in cluster traversers, it could happen in
   rare cases if the computation on one DBServer could be completed much earlier
   than the other server. It could also be restricted to SmartGraphs only.