Feng Lee
|
b144363f1e
|
Depends on jsx 2.9.0 and gproc 0.7.0
|
2018-03-03 09:07:45 +08:00 |
|
Feng Lee
|
fcb2ec8427
|
Merge the latest enterprise branch
|
2018-02-24 15:56:32 +08:00 |
|
Feng Lee
|
b63c34ab14
|
Merge the latest master branch
|
2018-02-24 11:27:09 +08:00 |
|
Feng Lee
|
06b8db1967
|
Merge branch 'emq24' into develop
|
2018-02-01 12:20:43 +08:00 |
|
Feng Lee
|
0dac7a2708
|
Version 2.3.5 - depends on the 'develop' branch of esockd, ekka and mochiweb
|
2018-02-01 12:18:49 +08:00 |
|
Feng Lee
|
4727acad14
|
Depends on esockd v5.2.1, mochiweb v4.2.2
|
2018-02-01 12:13:46 +08:00 |
|
Feng Lee
|
b9dcccd7f7
|
Version 2.3.4
|
2018-01-23 15:20:35 +08:00 |
|
Feng Lee
|
fde905d754
|
Merge branch 'emq24' into develop
|
2018-01-07 12:53:30 +08:00 |
|
Feng Lee
|
953a7628a3
|
Version 2.3.3
|
2017-12-28 11:34:29 +08:00 |
|
Feng Lee
|
6d2483d6c0
|
Merge develop branch to emq24
|
2017-12-26 22:17:38 +08:00 |
|
Feng Lee
|
013cc9705e
|
Depends on ekka v0.2.1
|
2017-12-26 22:15:09 +08:00 |
|
Feng Lee
|
bcec25092b
|
Merge version 2.3.2 to X edition
|
2017-12-26 21:09:24 +08:00 |
|
HuangDan
|
5aef79b1ad
|
Fixed Conflicting files
|
2017-12-26 00:44:45 +08:00 |
|
HuangDan
|
d7e56fa971
|
Upgrade the esockd library to v5.2
|
2017-12-25 17:31:23 +08:00 |
|
Feng Lee
|
6e5134a8b2
|
Merge with the enterprise edition
|
2017-12-07 16:24:48 +08:00 |
|
Feng Lee
|
f1640f5b85
|
Merge emq24 to X branch
|
2017-12-07 11:02:44 +08:00 |
|
HuangDan
|
ceafaad6b7
|
Update deps branch
|
2017-12-06 21:22:36 +08:00 |
|
HuangDan
|
921dba4eb4
|
Merge branch 'develop' into emq24
|
2017-12-06 21:20:30 +08:00 |
|
Feng Lee
|
0ba8d3e11d
|
Depends on develop branch of esockd and mochiweb
|
2017-12-06 20:13:27 +08:00 |
|
huangdan
|
b5c063f3cb
|
Merge pull request #1379 from emqtt/develop
Version 2.3.2
|
2017-12-06 15:52:55 +08:00 |
|
HuangDan
|
4c52d99706
|
Fixed test cases for emqttd_router_SUITE
|
2017-12-06 15:47:46 +08:00 |
|
Feng Lee
|
c3c5589452
|
Version 2.3.2
|
2017-12-06 10:01:42 +08:00 |
|
huangdan
|
e3161619c6
|
Merge pull request #1367 from emqtt/develop
Version 2.3.1
|
2017-12-03 00:54:07 +08:00 |
|
HuangDan
|
b8e0a4d5c4
|
Bump version to 2.3.1
|
2017-12-03 00:43:42 +08:00 |
|
Feng Lee
|
223f3d4da5
|
Remove RPC configurations
|
2017-11-22 16:44:00 +08:00 |
|
Feng Lee
|
38c33e9c8b
|
Merge with emqx
|
2017-11-21 22:41:05 +08:00 |
|
Feng Lee
|
2cec86eba7
|
Merge with version 2.3.0
|
2017-11-21 14:14:12 +08:00 |
|
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
|
4b8cd18f5d
|
Merge with EMQ X project
|
2017-10-09 19:43:06 +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 |
|
turtled
|
5419266724
|
emqttd_hook -> emqttd_hooks, syslog
|
2017-02-16 18:33:57 +08:00 |
|
Feng Lee
|
fde1f92bf2
|
Fix format of CT_SUITES
|
2017-02-16 11:49:59 +08:00 |
|
Feng Lee
|
61a54b4b33
|
Bump version to 2.1
|
2017-02-16 10:27:27 +08:00 |
|
Drew Varner
|
8e60b8f00a
|
Remove gen_logger references
|
2017-01-23 20:02:02 -05:00 |
|
Feng Lee
|
56992cd48b
|
Bump version to 2.0.7
|
2017-01-11 19:36:38 +08:00 |
|
Feng
|
435d91c111
|
Version 2.0.6
|
2017-01-07 18:37:24 +08:00 |
|
Feng Lee
|
9f56370f6b
|
2.0.5
|
2016-12-20 11:40:53 +08:00 |
|
Feng Lee
|
39c35c79de
|
2.0.4
|
2016-12-14 19:23:22 +08:00 |
|
huangdan
|
aa46cc0145
|
ssl-oneway ct
|
2016-12-14 13:45:59 +08:00 |
|
Feng
|
ce2261d446
|
Version 2.0.3
|
2016-12-12 23:10:34 +08:00 |
|
Feng
|
198fe84d91
|
clean deps
|
2016-12-04 14:31:14 +08:00 |
|
Feng
|
03e2e7b839
|
2.0.2
|
2016-12-04 14:23:46 +08:00 |
|
Feng Lee
|
1421a43da4
|
2.0.1
|
2016-11-29 13:17:45 +08:00 |
|
Feng
|
20902697cc
|
esockd master branch
|
2016-11-20 20:01:43 +08:00 |
|
Feng
|
643f81a103
|
comment pbkdf2
|
2016-10-19 12:12:22 +08:00 |
|
Feng
|
9b0deda679
|
comment clique
|
2016-10-19 10:49:03 +08:00 |
|
Feng
|
c8e9483ad6
|
fix tab
|
2016-10-19 00:35:35 +08:00 |
|
Feng Lee
|
1038f854e3
|
merge
|
2016-10-16 17:31:59 +08:00 |
|
huangdan
|
3a3c2977a0
|
vm ct
|
2016-10-16 11:42:06 +08:00 |
|
Feng Lee
|
f1d9f7cd49
|
emqtt/cuttlefish
|
2016-10-15 13:59:20 +08:00 |
|
Feng Lee
|
f08fa2c17f
|
TEST_DEPS
|
2016-10-14 12:44:40 +08:00 |
|
Feng Lee
|
e26ed33f7f
|
rename emqttd.conf -> emq.conf
|
2016-10-12 19:30:34 +08:00 |
|
Feng Lee
|
3cfac3430a
|
add etc/emqttd.conf, priv/emqttd.schema
|
2016-10-12 18:22:20 +08:00 |
|
Feng Lee
|
0e4b7cf768
|
rm src/emqttd.app.src
|
2016-10-11 14:46:35 +08:00 |
|
huangdan
|
7ad428dda8
|
vm ct
|
2016-10-11 09:47:08 +08:00 |
|
Feng Lee
|
53e9b36ba4
|
listeners, modules
|
2016-10-08 19:57:28 +08:00 |
|
Feng
|
3406137433
|
new config
|
2016-10-08 18:38:33 +08:00 |
|
Feng
|
36ecbdc653
|
rm .git
|
2016-10-02 14:18:42 +08:00 |
|
Feng
|
a4f4b3d283
|
emq20
|
2016-09-05 22:13:28 +08:00 |
|
Feng Lee
|
9a4c44913e
|
commen tests
|
2016-08-12 12:59:03 +08:00 |
|
Feng
|
f998d2a41d
|
fix CT errors
|
2016-07-23 11:10:55 +08:00 |
|
Feng Lee
|
e5efa77078
|
make ct
|
2016-07-23 09:31:51 +08:00 |
|
Feng Lee
|
efd1355597
|
add test_data
|
2016-07-23 08:57:36 +08:00 |
|
Feng
|
2e200f253f
|
2.0 - erlang.mk to replace rebar
|
2016-07-19 17:46:05 +08:00 |
|
Feng
|
0d84c7474a
|
rm plugins
|
2016-04-30 10:21:53 +08:00 |
|
Feng
|
a471f6a3e2
|
rm submodules
|
2016-04-30 10:19:23 +08:00 |
|
Feng
|
a49006779b
|
0.17.0
|
2016-03-11 23:52:50 +08:00 |
|
Feng
|
c94f6f30dd
|
ct - emqttd.test.config
|
2016-03-11 23:48:56 +08:00 |
|
Feng
|
9ec6abde31
|
ct as test
|
2016-02-16 03:13:08 +08:00 |
|
Feng
|
928780f322
|
common tests
|
2016-02-16 02:20:29 +08:00 |
|
Feng
|
dfc2c7c79d
|
ERL_FLAGS for test
|
2016-02-14 01:51:27 +08:00 |
|
Feng Lee
|
ba8c81e805
|
dialyzer plugins/*/ebin
|
2015-10-11 21:44:05 +08:00 |
|
Ery Lee
|
0232c636ad
|
submods
|
2015-09-26 05:50:04 +00:00 |
|
Feng
|
59b57ce7ca
|
0.11.1
|
2015-09-26 13:14:50 +08:00 |
|
Feng
|
4b53f84d17
|
submods, erl_opts
|
2015-09-26 13:10:25 +08:00 |
|
Feng
|
8ee8e00583
|
submods
|
2015-09-26 12:56:39 +08:00 |
|
Feng Lee
|
e44b299a50
|
mods
|
2015-09-25 23:58:20 +08:00 |
|
Feng Lee
|
a9eb3c83ce
|
plugins
|
2015-08-09 17:30:31 +08:00 |
|
Feng Lee
|
2e01595be7
|
plugins
|
2015-08-06 00:01:25 +08:00 |
|
Feng
|
5f6b0fc624
|
rm apps/
|
2015-08-03 23:50:48 +08:00 |
|
Feng Lee
|
613d38e288
|
dialyzer
|
2015-05-04 23:25:17 +08:00 |
|
Feng Lee
|
409b5dbe42
|
copy plugins...
|
2015-04-30 17:38:45 +08:00 |
|
Feng Lee
|
a7cbfc0a6e
|
dist: compile
|
2015-04-30 16:40:05 +08:00 |
|
Feng Lee
|
74217bf9ea
|
Plugins
|
2015-04-23 00:00:26 +08:00 |
|
Feng Lee
|
554a7cbbd0
|
emqttd
|
2015-03-13 00:07:34 +08:00 |
|
Ery Lee
|
2d2aa2f79a
|
upgrade esockd, mochiweb
|
2015-03-02 01:40:22 +08:00 |
|
Feng Lee
|
fc7cce87e8
|
deps -> get-deps
|
2015-01-08 14:41:32 +08:00 |
|
Ery Lee
|
d5b6152aa8
|
0.2.0 upgrade
|
2014-12-06 23:10:45 +08:00 |
|
Feng Lee
|
3a6ed9a876
|
0.2 project structure
|
2014-12-06 19:12:29 +08:00 |
|
erylee
|
45647b5ca7
|
rebar release
|
2012-12-26 12:56:00 +08:00 |
|
erylee
|
efc1d9f424
|
add bin/ and some files
|
2012-12-21 17:33:21 +08:00 |
|
erylee
|
cc67e10e69
|
fix client
|
2012-12-20 16:44:57 +08:00 |
|
erylee
|
a77bbf33e2
|
first workable
|
2012-12-20 16:30:51 +08:00 |
|
Ery Lee
|
cb04c9c7e5
|
add file
|
2012-12-19 13:42:03 +08:00 |