turtled
|
d8d96c1c6e
|
fix windows branch conflicts
|
2017-03-31 14:44:13 +08:00 |
|
turtleDeng
|
8bc0ba9a7b
|
Merge pull request #968 from emqtt/emq20
V2.1.0-rc.2
|
2017-03-31 11:20:43 +08:00 |
|
turtled
|
45ca461fd9
|
Add ignore self publish message
|
2017-03-30 14:41:29 +08:00 |
|
turtled
|
acedcbbfd4
|
syslog handlers emqttd
|
2017-03-30 11:49:19 +08:00 |
|
turtled
|
5c866d91b4
|
support cascading multiple acl modules
|
2017-03-30 09:43:35 +08:00 |
|
HuangDan
|
9bfa46c880
|
Add issues#963 case
|
2017-03-29 21:20:05 +08:00 |
|
Feng Lee
|
ca8e7e6423
|
Merge branch 'develop' into emq20
|
2017-03-29 17:39:36 +08:00 |
|
Feng Lee
|
43207f86ea
|
Use stop/2 to count the shutdown reasons
|
2017-03-29 17:38:43 +08:00 |
|
Feng Lee
|
9240a0355a
|
Fix issue #963 - shutdown if session process exited
|
2017-03-29 16:36:17 +08:00 |
|
Feng Lee
|
300bfce372
|
Merge pull request #964 from emqtt/develop
Fix issue #963 - shutdown if session process exited
|
2017-03-29 16:31:51 +08:00 |
|
turtled
|
4f0bd74f87
|
#777
|
2017-03-29 15:28:24 +08:00 |
|
Feng Lee
|
ec28773893
|
Merge emq20 branch
|
2017-03-27 09:36:42 +08:00 |
|
Feng Lee
|
33a3933ea2
|
Merge pull request #958 from phanimahesh/update-app.src
correct licence in app.src
|
2017-03-24 20:02:40 +08:00 |
|
J Phani Mahesh
|
2f01400f38
|
correct licence in app.src
|
2017-03-24 15:58:51 +05:30 |
|
Feng Lee
|
00a957b658
|
Merge pull request #957 from emqtt/emq20
Depend on emqtt/pbkdf2 to fix the building errors of Travis CI
|
2017-03-24 14:55:39 +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
|
3b73e71404
|
Merge pull request #956 from emqtt/develop
Depend on goldrush and emqtt/pbkdf2 to resolve the building errors
|
2017-03-24 13:26:55 +08:00 |
|
Feng Lee
|
50a5c304e2
|
Merge branch 'emq20' into develop
|
2017-03-24 13:26:42 +08:00 |
|
Feng Lee
|
a1984d857a
|
Remove src/pbkdf2.erl
|
2017-03-24 12:35:54 +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
|
d9b4376c17
|
Copy the pbkdf2.erl module from erlang-pbkdf2 project
|
2017-03-24 11:27:23 +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
|
852c671881
|
Add goldrush dep
|
2017-03-24 10:46:52 +08:00 |
|
Feng Lee
|
18c8785bf9
|
Fix 'rebar command not found'
|
2017-03-24 10:46:08 +08:00 |
|
Feng Lee
|
ddaa18ecc8
|
Merge pull request #954 from emqtt/update-rebar-lock
update rebar.lock
|
2017-03-24 09:24:24 +08:00 |
|
J Phani Mahesh
|
e39a96cbc8
|
update rebar.lock
This was missed when pbkdf2 was added and esockd was updated.
mochiweb silently got an update, which I wouldn't have realised
if not for this.
|
2017-03-23 22:00:24 +05:30 |
|
Feng Lee
|
440307081b
|
Check if the node is in cluster before remove
|
2017-03-23 18:37:04 +08:00 |
|
Feng Lee
|
f194f92418
|
Shutdown the connection if no more data received
|
2017-03-23 16:30:23 +08:00 |
|
Feng Lee
|
3c8de09ba3
|
Rename the env 'queue' to 'mqueue'
|
2017-03-23 15:20:32 +08:00 |
|
Feng Lee
|
06100ae6d5
|
Define 'MQueue' macro
|
2017-03-23 15:15:45 +08:00 |
|
Feng Lee
|
690f27a8b4
|
Support 'mount point'
|
2017-03-23 15:10:24 +08:00 |
|
Feng Lee
|
496d046d52
|
Improve the mqueue design
|
2017-03-23 15:07:06 +08:00 |
|
Feng Lee
|
0d617c17e0
|
Use the emqttd_protocol:init/4 API
|
2017-03-23 15:06:14 +08:00 |
|
Feng Lee
|
66c3c26d8b
|
Support 'mountpoint'
|
2017-03-23 15:04:37 +08:00 |
|
Feng Lee
|
e469ffe7c7
|
Support multiple TCP/SSL listeners
|
2017-03-23 15:04:02 +08:00 |
|
Feng Lee
|
a0c60f11cf
|
Depends on 'emq22' branch
|
2017-03-22 10:49:09 +08:00 |
|
Feng Lee
|
f321bcdace
|
Support proxy protocol v1/2 config
|
2017-03-22 10:48:47 +08:00 |
|
Feng Lee
|
0b13cd78e6
|
Version 2.2
|
2017-03-22 10:48:24 +08:00 |
|
Feng Lee
|
f0e6fc16c7
|
Version 2.2
|
2017-03-22 10:48:12 +08:00 |
|
Feng Lee
|
ee79412007
|
Merge pull request #778 from emqtt/proxy-protocol
Support Proxy protocol V1/2
|
2017-03-22 10:20:57 +08:00 |
|
Feng Lee
|
942edad3c5
|
Merge branch 'emq22' into proxy-protocol
|
2017-03-22 10:18:44 +08:00 |
|
Feng Lee
|
b3cb875eb2
|
Depends on the 'emq22' branch of esockd, mochiweb
|
2017-03-22 10:13:17 +08:00 |
|
黄丹
|
e56ba41027
|
Update arg sslopts
|
2017-03-16 10:03:58 +08:00 |
|
Feng Lee
|
076b3c0068
|
Upgrade esockd library to v4.2
|
2017-03-13 17:10:54 +08:00 |
|
Feng Lee
|
3ebcb71e9f
|
Upgrade esockd library to v4.2
|
2017-03-13 17:03:34 +08:00 |
|
Feng Lee
|
dbbe499769
|
Merge pull request #943 from emqtt/emq20
Version 2.1.0-beta.2 updates
|
2017-03-13 16:56:39 +08:00 |
|
Feng Lee
|
ecbc1cf56b
|
Format the 'dep_' lines
|
2017-03-13 16:51:46 +08:00 |
|
Feng Lee
|
b5446ceb4d
|
Change the 'ssl' to 'sslopts'
|
2017-03-13 16:35:36 +08:00 |
|
Feng Lee
|
764e506f8d
|
Merge branch 'emq20' of github.com:emqtt/emqttd into emq20
|
2017-03-13 16:32:32 +08:00 |