yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into emq10

This commit is contained in:
Feng Lee 2016-05-23 11:40:11 +08:00
parent 91c920a797 eaa23abd95
commit 03f413cdb7
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -90,7 +90,7 @@ Download binary package for Linux, Mac and Freebsd from [http://emqtt.io/downloa
Installing on Ubuntu64, for example: Installing on Ubuntu64, for example:
```sh ```sh
unzip emqttd-macosx-0.16.0-beta-20160216.zip && cd emqttd unzip emqttd-ubuntu64-0.16.0-beta-20160216.zip && cd emqttd
# start console # start console
./bin/emqttd console ./bin/emqttd console

10
docs/source/changes.rst
View File

@ -5,6 +5,16 @@
Changes Changes
======= =======
.. _release_1.0.3:
-------------
Version 1.0.3
-------------
*Release Date: 2016-05-23*
eSockd 3.2
.. _release_1.0.2: .. _release_1.0.2:
------------- -------------

2
rebar.config
View File

@ -41,7 +41,7 @@
{deps, [ {deps, [
{gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}}, {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}},
{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}}, {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
{esockd, ".*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}}, {esockd, ".*", {git, "git://github.com/emqtt/esockd.git", {tag, "3.2"}}},
{mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}} {mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}}
]}. ]}.