Merge branch '2.0' into develop

2016-11-21 10:55:56 +02:00
parent 7ef1086040 3b30d5c810
commit 9e4ee0323d
22 changed files with 570 additions and 251 deletions
--- a/Documentation/Reference/MaxAdmin.md
+++ b/Documentation/Reference/MaxAdmin.md
@ -520,6 +520,10 @@ The status bit that can be controlled are
    <td>maintenance</td>
    <td>The server is in maintenance mode. In this mode no new connections will be established to the server. The monitors will also not monitor servers that are in maintenance mode.</td>
  </tr>
+  <tr>
+    <td>stale</td>
+    <td>The server is a stale master server. Read [MySQL Monitor](../Monitors/MySQL-Monitor.md) documentation for more details.</td>
+  </tr>
 </table>