From f53bd94dc334c56968ac4e33e19d9ca6a2b5aa22 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Sun, 25 Jan 2015 13:59:30 -0800
Subject: [PATCH] Clarify the compatibility

---
 CHANGELOG.md                                    | 13 +++++++++++++
 website/source/docs/compatibility.html.markdown |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b4e5cb17..251c3a5eca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,19 @@ MISC:
  * Many documentation improvements
  * Reduce log messages when quorum member is logs [GH-566]
 
+UPGRADE NOTES:
+
+ * If `acl_default_policy` is "deny", ensure tokens are updated to enable
+   service registration to avoid a service disruption. The new ACL policy
+   can be submitted with 0.4 before upgrading to 0.5 where it will be
+   enforced.
+
+ * Servers running 0.5.X cannot be mixed with older servers. (Any client
+   version is fine). There is a 15 minute upgrade window where mixed
+   versions are allowed before older servers will panic due to an unsupported
+   internal command. This is due to the new KV tombstones which are internal
+   to servers.
+
 ## 0.4.1 (October 20, 2014)
 
 FEATURES:
diff --git a/website/source/docs/compatibility.html.markdown b/website/source/docs/compatibility.html.markdown
index 1d5516568d..9edcd55893 100644
--- a/website/source/docs/compatibility.html.markdown
+++ b/website/source/docs/compatibility.html.markdown
@@ -50,4 +50,8 @@ upgrading, see the [upgrading page](/docs/upgrading.html).
     <td>0.4</td>
     <td>1, 2</td>
   </tr>
+  <tr>
+    <td>0.5</td>
+    <td>1, 2. 0.5.X servers cannot be mixed with older servers.</td>
+  </tr>
 </table>