yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Feng Lee 2015-05-04 11:46:56 +08:00
parent 01ab65dbc4 21f5d730d9
commit d3b67571fc
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -75,7 +75,7 @@ cd emqttd && make && make dist
## GetStarted ## GetStarted
Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detaied installation and configuration guide. Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detailed installation and configuration guide.
## Benchmark ## Benchmark

0
plugins/emqttd_auth_mysql/.placehodler
View File

2
rel/files/acl.config
View File

@ -1,6 +1,6 @@
%%%----------------------------------------------------------------------------- %%%-----------------------------------------------------------------------------
%% %%
%% [ACL Design](https://github.com/emqtt/emqttd/wiki/ACL-Design) %% [ACL](https://github.com/emqtt/emqttd/wiki/ACL)
%% %%
%% -type who() :: all | binary() | %% -type who() :: all | binary() |
%% {ipaddr, esockd_access:cidr()} | %% {ipaddr, esockd_access:cidr()} |