Commit Graph

114 Commits

Author SHA1 Message Date
huangdan 6c5d2e7d69
Merge pull request #1325 from emqtt/develop
Version 2.3.0
2017-11-19 00:55:59 -06:00
HuangDan 2d92f95294 Update the test cases for emqttd 2017-11-19 12:06:55 +08:00
Feng Lee 62d4f9f031 Bump version to 2.3.0 2017-11-17 20:53:07 +08:00
Feng Lee e1816a5682 Remove rebar.config to fix the building error of CI 2017-08-28 17:31:38 +08:00
Feng Lee b5f741391b Add 'make autopatch' to fix the building error of travis CI 2017-08-28 15:01:50 +08:00
Feng Lee 12fb31f2f6 Merge pull request #1208 from getong/add_erlang_20
add erlang 20
2017-08-23 10:03:06 +08:00
huangdan 0a1ad99c88 Merge pull request #1214 from emqtt/emq24
Version 2.3-beta.3
2017-08-21 16:49:17 +08:00
HuangDan 75c6348cf5 Added more test cases for hot configuration 2017-08-16 03:07:30 +08:00
HuangDan 0f54613c11 Fix Conflicting files 2017-08-12 22:33:24 +08:00
HuangDan 8cb07b6299 Update Depends of clique 2017-08-11 17:15:53 +08:00
turtled 701ee3e8dc Add CLI set/get env 2017-08-10 18:19:20 +08:00
Feng Lee ffebce5090 Depend on develop branch of ekka 2017-07-26 13:58:44 +08:00
Feng Lee 74145cf5df Depends on master branch of ekka library 2017-07-23 18:55:21 +08:00
Feng Lee 263a553c50 Depends on emq24 branch of ekka library 2017-07-23 18:53:43 +08:00
Feng Lee 0a7ca2cdb3 Depends on ekka 0.2 develop branch 2017-07-18 18:37:52 +08:00
turtleDeng 523dd9c8b0 Merge pull request #1145 from emqtt/master
Merge emq22
2017-07-10 13:07:32 +08:00
huangdan f0fc53b9fe Merge pull request #1142 from emqtt/emq22
Version 2.2.0
2017-07-08 14:54:39 +08:00
HuangDan f9cf00804f Add dialyze dependencies 2017-07-06 15:54:03 +08:00
Feng Lee 9b646d8cbc Integrage with 'ekka' library 2017-06-16 12:30:09 +08:00
Feng Lee 44565a3de1 Version 2.3 2017-06-15 16:43:07 +08:00
huangdan 0067090d6a Merge pull request #1101 from emqtt/emq22
Version 2.2-rc.1
2017-06-13 22:21:16 +08:00
huangdan 034f39e811 Add ‘Compiled with option debug_info’ 2017-06-05 10:38:48 +08:00
turtled 3074a4b0ab Rollback code 2017-05-19 09:27:48 +08:00
turtled 798c60f269 Rollback code 2017-05-19 09:26:52 +08:00
turtled d5ccb9f92f Cli command support --format=json output 2017-05-17 16:27:18 +08:00
turtled 2d6104fbd9 Ctl use clique 2017-05-11 16:02:38 +08:00
turtled 9e211b55a0 deps branch master 2017-05-04 22:31:41 +08:00
turtled ba0c08517f v2.2 2017-04-25 10:41:43 +08:00
Feng Lee 87d3bb1419 Merge branch 'emq22' into emq20 2017-04-25 08:59:05 +08:00
Feng Lee 3c9cde59c7 Merge pull request #1004 from emqtt/develop
Fix crash caused by duplicated PUBREC packet
2017-04-20 10:15:30 +08:00
huangdan 6a14c7c1b9 Version 2.1.2 2017-04-20 09:48:34 +08:00
huangdan 65c7896f7c Merge pull request #993 from emqtt/develop
Version 2.1.1
2017-04-13 10:03:20 +08:00
huangdan 6effb5fdbe Version 2.1.1 2017-04-13 10:02:32 +08:00
turtled 7d618e78ff support bcrypt 2017-04-11 16:02:21 +08:00
Feng Lee 3ee8d18ab2 Merge branch 'master' into emq20 2017-03-24 14:55:28 +08:00
Feng Lee 783079cb07 Merge emq20 branch 2017-03-24 13:35:43 +08:00
Feng Lee 50a5c304e2 Merge branch 'emq20' into develop 2017-03-24 13:26:42 +08:00
Feng Lee b54fba2a5d Depend on emqtt/pbkdf2 to resovle the building errors of Travis CI 2017-03-24 12:35:39 +08:00
Feng Lee 181ac36171 Remove the 'erlang-pbkdf2' dep to resolve CI building error 2017-03-24 11:26:42 +08:00
Feng Lee 18c8785bf9 Fix 'rebar command not found' 2017-03-24 10:46:08 +08:00
Feng Lee f0e6fc16c7 Version 2.2 2017-03-22 10:48:12 +08:00
Feng Lee b3cb875eb2 Depends on the 'emq22' branch of esockd, mochiweb 2017-03-22 10:13:17 +08:00
Feng Lee 3ebcb71e9f Upgrade esockd library to v4.2 2017-03-13 17:03:34 +08:00
Feng Lee ecbc1cf56b Format the 'dep_' lines 2017-03-13 16:51:46 +08:00
Feng Lee 056dc747ad Depend on emq20 branch of esockd library 2017-03-13 14:56:59 +08:00
huangpengju 78b0f66910 Update Makefile 2017-03-09 09:29:03 +08:00
huangpengju 25c25826a7 Update Makefile 2017-03-09 09:28:28 +08:00
huangpj fba79b3e25 support pbkdf2 2017-03-08 18:01:59 +08:00
Feng Lee 03e6c8b64c Version 2.1.0 2017-02-22 17:33:25 +08:00
Feng Lee 05e34fe783 Move the 'cuttlefish' library from TEST_DEPS to BUILD_DEPS 2017-02-22 16:19:49 +08:00