Commit Graph

7654 Commits

Author SHA1 Message Date
Feng Lee 40264564af esockd_cidr 2016-05-23 15:21:04 +08:00
Feng Lee 820806d4f0 esockd_cidr 2016-05-23 15:20:56 +08:00
Feng Lee b90a8adbba Merge branch 'master' into emq10 2016-05-23 12:19:00 +08:00
Feng Lee 22ae889ee6 MochiWeb 4.0.1 2016-05-23 12:00:06 +08:00
Feng Lee 03f413cdb7 Merge branch 'master' into emq10 2016-05-23 11:40:11 +08:00
Feng Lee eaa23abd95 esockd 3.2 2016-05-23 11:35:46 +08:00
Feng Lee 759de338b6 esockd 3.2 2016-05-23 11:32:52 +08:00
Feng Lee 91c920a797 upgrade dashboard 2016-05-21 14:21:15 +08:00
Feng Lee e631ded2da Merge branch 'emq10' of github.com:emqtt/emqttd into emq10 2016-05-17 10:57:15 +08:00
Feng Lee e16f8506ef base62 encode/decode 2016-05-17 10:36:09 +08:00
Feng Lee 9e9b074d84 error 2016-05-07 13:07:02 +08:00
Feng Lee c7ecc0ace0 merge emq10 2016-05-07 10:30:22 +08:00
Feng Lee 3ef099389a 1.1 2016-05-05 18:18:50 +08:00
Feng Lee 6245d24c83 {error, already_existed} 2016-05-05 15:44:36 +08:00
Feng Lee f50efa5813 fix issue#542 2016-05-05 15:36:44 +08:00
Feng Lee 88fd4f5734 Merge pull request #540 from andrewchambers/patch-1
Use ubuntu64.zip for ubuntu64 example
2016-05-05 09:16:55 +08:00
andrewchambers 0282b411c9 Use ubuntu64.zip for ubuntu64 example 2016-05-05 11:18:07 +12:00
Feng Lee f6f6dfdb8d merge master 2016-05-04 15:55:08 +08:00
Feng f51c062d23 upgrade emqttd_reloader 2016-05-04 02:36:04 +08:00
Feng e57387a26c upgrade emqttd_reloader 2016-05-04 02:18:00 +08:00
Feng Lee a255d38fa8 Merge pull request #539 from emqtt/emq10
1.0.2 - bugfix
2016-05-04 01:36:07 +08:00
Feng a95f96a321 1.0.2 - upgrade plugins 2016-05-04 01:25:33 +08:00
Feng dae1cc1f81 1.0.2 release 2016-05-04 01:02:00 +08:00
Feng Lee 76851e58fb atom_to_list(Username) 2016-05-03 18:31:58 +08:00
Feng Lee 816827e1ee Merge branch 'master' into emq10 2016-05-03 18:29:25 +08:00
Feng Lee 9cf5e5cf2a vm([]) 2016-05-03 18:29:05 +08:00
Feng Lee c2591494b6 esockd .* 2016-05-03 18:23:06 +08:00
Feng Lee 9b71f9f6c0 new plugin mechanism 2016-05-03 18:02:41 +08:00
Feng Lee 3aef962a07 2.0 2016-05-02 22:31:28 +08:00
Feng Lee 631609f035 ensure gen_logger started 2016-05-02 15:15:05 +08:00
Feng Lee c73d299942 gen_logger 2016-05-02 01:05:55 +08:00
Feng Lee f96f209b4a esockd .* 2016-05-02 00:55:59 +08:00
Feng Lee f0e7c55d42 .* 2016-05-02 00:53:21 +08:00
Feng Lee 6c7ea546cc esockd 4.0 2016-05-02 00:52:37 +08:00
Feng Lee 608d034806 fix conflict 2016-05-01 18:03:38 +08:00
Feng Lee f2163c7dbb rm submods, add 'extra' field 2016-05-01 18:02:51 +08:00
Feng 4900641a89 extra 2016-04-30 14:18:16 +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 23525f9ca0 remove submodules 2016-04-30 10:18:00 +08:00
Feng 5c1d9cd176 modules 2016-04-30 10:17:08 +08:00
Feng 3c69124d96 upgrade reloader plugin 2016-04-29 00:46:27 +08:00
Feng 26df1f59bc update stomp, reloader plugins 2016-04-29 00:38:00 +08:00
Feng Lee 1e89fcec1e Merge pull request #537 from emqtt/issue#534
Fix issue#534 - Add './bin/emqttd_ctl vm ports' CLI
2016-04-29 00:23:39 +08:00
Feng Lee 17d1598688 Fix issue#534 - Add './bin/emqttd_ctl vm ports' CLI 2016-04-29 00:23:57 +08:00
Feng Lee 770fbcdae6 Merge pull request #536 from emqtt/issue#535
fix issue #535
2016-04-29 00:23:03 +08:00
Feng f5adafe9e2 fix issue #535 2016-04-29 00:17:07 +08:00
Feng Lee 4de3380d96 emqplus backends 2016-04-25 22:27:04 +08:00
Feng Lee 18b8e8195f Merge pull request #519 from emqtt/emq10
issue#516 - The erlang '-name' requires the fully qualified host name
2016-04-19 16:30:46 +08:00
Feng 16fcb2997e issue#516 - The erlang '-name' requires the fully qualified host name 2016-04-19 16:14:07 +08:00