turtleDeng
|
bf8b5c3c61
|
Merge pull request #997 from emqtt/emq20
Version 2.1.1
|
2017-04-13 16:12:41 +08:00 |
|
huangdan
|
455a978c96
|
Merge pull request #996 from emqtt/develop
Fix the subscrptions print
|
2017-04-13 15:10:57 +08:00 |
|
HuangDan
|
0cbca5f4c0
|
Fix the subscrptions print
|
2017-04-13 15:09:48 +08:00 |
|
huangdan
|
bc280701cd
|
Merge pull request #994 from emqtt/develop
Version 2.1.1
|
2017-04-13 10:26:10 +08:00 |
|
huangdan
|
b10938c90a
|
Version 2.1.1
|
2017-04-13 10:24:50 +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 |
|
turtleDeng
|
6f02d775e4
|
Merge pull request #991 from emqtt/develop
Support HEAD method for health check
|
2017-04-10 22:16:22 -05:00 |
|
turtled
|
5476288ab3
|
Merge branch 'develop' of https://github.com/emqtt/emqttd into develop
|
2017-04-11 09:40:46 +08:00 |
|
turtled
|
43cc90ceae
|
bridge message qos default 0
|
2017-04-11 09:40:31 +08:00 |
|
Feng Lee
|
e6df089ecb
|
Fix issue #984 - support HEAD method for health check
|
2017-04-10 13:37:50 +08:00 |
|
Feng Lee
|
c82bf817c3
|
Merge pull request #983 from emqtt/emq20
Add icon for slack channel
|
2017-04-06 17:53:05 +08:00 |
|
Feng Lee
|
a17541585c
|
Merge pull request #982 from emqtt/develop
Add icon for slack channel
|
2017-04-06 17:50:09 +08:00 |
|
Feng Lee
|
a536226a0a
|
Merge pull request #981 from CrazyWisdom/develop
README.md add slack invite url
|
2017-04-06 17:47:32 +08:00 |
|
zhangwh
|
f375eeaa18
|
README.md add slack invite url
|
2017-04-06 13:45:21 +08:00 |
|
turtleDeng
|
ca03a84968
|
Merge pull request #973 from emqtt/emq20
syslog default level error
|
2017-03-31 15:32:26 +08:00 |
|
turtled
|
3573156e8f
|
syslog default level error
|
2017-03-31 15:31:50 +08:00 |
|
turtled
|
a125236220
|
fix windows branch conflicts
|
2017-03-31 14:47:25 +08:00 |
|
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
|
acedcbbfd4
|
syslog handlers emqttd
|
2017-03-30 11:49:19 +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 |
|
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
|
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 |
|
黄丹
|
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 |
|
Feng Lee
|
d31a0ea7dc
|
Merge pull request #944 from emqtt/develop
V2.1.0-beta.2: Add more test cases
|
2017-03-13 16:31:58 +08:00 |
|
Feng Lee
|
f48def7657
|
Merge branch 'emq20' of github.com:emqtt/emqttd into emq20
|
2017-03-13 16:31:13 +08:00 |
|
Feng Lee
|
2e6e97b006
|
Fix the syntax error
|
2017-03-13 16:30:41 +08:00 |