Merge branch 'dev' of github.com:emqtt/emqtt into dev

2015-05-07 10:47:09 +08:00 · 2015-05-07 10:47:09 +08:00 · 5fdec5b8c4
parent a99401053d eea6d220d5
commit 5fdec5b8c4
3 changed files with 8 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,12 @@
 emqttd ChangeLog
 ==================

+0.8.0-alpha (2015-05-16)
+-------------------------
+
+Improve: emqtt_topic module add join/1, feed_var/3, is_queue/1
+
+
 0.7.1-alpha (2015-05-04)
 -------------------------

--- a/apps/emqtt/src/emqtt.app.src
+++ b/apps/emqtt/src/emqtt.app.src
@ -1,7 +1,7 @@
 {application, emqtt,
 [
  {description, "Erlang MQTT Common Library"},
-  {vsn, "0.7.1"},
+  {vsn, "0.8.0"},
  {modules, []},
  {registered, []},
  {applications, [
--- a/apps/emqttd/src/emqttd.app.src
+++ b/apps/emqttd/src/emqttd.app.src
@ -1,7 +1,7 @@
 {application, emqttd,
 [
  {description, "Erlang MQTT Broker"},
-  {vsn, "0.7.1"},
+  {vsn, "0.8.0"},
  {modules, []},
  {registered, []},
  {applications, [kernel,