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

This commit is contained in:
Feng Lee 2015-05-07 10:47:09 +08:00
commit 5fdec5b8c4
3 changed files with 8 additions and 2 deletions

View File

@ -2,6 +2,12 @@
emqttd ChangeLog 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) 0.7.1-alpha (2015-05-04)
------------------------- -------------------------

View File

@ -1,7 +1,7 @@
{application, emqtt, {application, emqtt,
[ [
{description, "Erlang MQTT Common Library"}, {description, "Erlang MQTT Common Library"},
{vsn, "0.7.1"}, {vsn, "0.8.0"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [ {applications, [

View File

@ -1,7 +1,7 @@
{application, emqttd, {application, emqttd,
[ [
{description, "Erlang MQTT Broker"}, {description, "Erlang MQTT Broker"},
{vsn, "0.7.1"}, {vsn, "0.8.0"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel, {applications, [kernel,