diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-03-24 13:27:56 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-03-24 13:27:56 +0300 |
| commit | e30d41e5f0be428d4a5f51b764d35040752a344b (patch) | |
| tree | b614fdf27661edb42f35d7d5ccfc6e83945d08a1 /rebar.config | |
| parent | Avoid PID collisions (diff) | |
| parent | Improve overloaded S2S queue processing (diff) | |
Merge branch 'new_queue'
Conflicts:
rebar.config
src/mod_muc_admin.erl
Diffstat (limited to 'rebar.config')
| -rw-r--r-- | rebar.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rebar.config b/rebar.config index 14d6dab5..f8dce38b 100644 --- a/rebar.config +++ b/rebar.config @@ -19,7 +19,7 @@ %%%---------------------------------------------------------------------- {deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}}, - {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.7"}}}, + {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", "f677e61"}}, {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.7"}}}, {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.11"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.8"}}}, @@ -81,6 +81,7 @@ {i, "include"}, {i, "deps/fast_xml/include"}, {i, "deps/xmpp/include"}, + {i, "deps/p1_utils/include"}, {if_var_false, debug, no_debug_info}, {if_var_true, debug, debug_info}, {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, @@ -134,6 +135,7 @@ {eunit_compile_opts, [{i, "tools"}, {i, "include"}, + {i, "deps/p1_utils/include"}, {i, "deps/fast_xml/include"}, {i, "deps/xmpp/include"}]}. |