Merge branch 'master' into emq10

README.md

@@ -1,5 +1,5 @@
 
-## Overview [![Build Status](https://travis-ci.org/emqtt/emqttd.svg?branch=master)](https://travis-ci.org/emqtt/emqttd)  [![Join the chat at https://gitter.im/emqtt/emqttd](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/emqtt/emqttd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+## Overview [![Build Status](https://travis-ci.org/emqtt/emqttd.svg?branch=master)](https://travis-ci.org/emqtt/emqttd)
 
 emqttd is a massively scalable and clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP.
 
@@ -83,7 +83,7 @@ Default Login/Password: admin/public
 
 ## Design
 
-![emqttd architecture](http://emqtt.io/static/img/Architecture.png)
+![emqttd architecture](http://emqtt.io/static/img/architecture.png)
 
 ## QuickStart
 

docs/source/changes.rst

@@ -5,6 +5,20 @@
 Changes
 =======
 
+.. _release_1.1.1:
+
+-------------
+Version 1.1.1
+-------------
+
+*Release Date: 2016-06-04*
+
+Compatible with the Qos0 PUBREL packet (#575)
+
+phpMqtt Client Compatibility (#572)
+
+java.io.EOFException using paho java client (#551)
+
 .. _release_1.1:
 
 -----------

plugins/emqttd_dashboard

@@ -1 +1 @@
-Subproject commit 26c727be2b31180780d582e460e20fe418af1909
+Subproject commit f4ed05ee52d487dbab899aafa96b72519725978c

plugins/emqttd_plugin_mysql

@@ -1 +1 @@
-Subproject commit ff967b4046ee7d4e568ebbdb248289bd3724b1f6
+Subproject commit f9a00100db19b864d7bdbe1eeca49978ea6934a9