From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Fri, 24 Mar 2017 10:27:56 +0000 (+0300)
Subject: Merge branch 'new_queue'
X-Git-Tag: 17.04~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e30d41e5f0be428d4a5f51b764d35040752a344b;p=ejabberd

Merge branch 'new_queue'

Conflicts:
	rebar.config
	src/mod_muc_admin.erl
---

e30d41e5f0be428d4a5f51b764d35040752a344b
diff --cc rebar.config
index 14d6dab5f,ca41b6ee6..f8dce38be
--- a/rebar.config
+++ b/rebar.config
@@@ -19,15 -19,15 +19,15 @@@
  %%%----------------------------------------------------------------------
  
  {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.6"}}},
 -        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", "afdd07811e0e6eff444c035ffeb2aa9efb4dbe6d"}},
 -        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.7"}}},
 +        {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"}}},
          {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.21"}}},
 -        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "4aaed37a16fc21be505553aabf9f47a48b8af027"}},
 -        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.9"}}},
 -        {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.10"}}},
 -        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.8"}}},
 +        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.9"}}},
 +        {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.10"}}},
 +        {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.11"}}},
 +        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.9"}}},
          {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
          {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}},
          {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
diff --cc src/jlib.erl
index 6913542f9,38a71d7cc..12bedbc7e
--- a/src/jlib.erl
+++ b/src/jlib.erl
@@@ -37,10 -37,8 +37,9 @@@
  
  -export([tolower/1, term_to_base64/1, base64_to_term/1,
  	 decode_base64/1, encode_base64/1, ip_to_list/1,
 +	 hex_to_bin/1, hex_to_base64/1,
  	 atom_to_binary/1, binary_to_atom/1, tuple_to_binary/1,
- 	 l2i/1, i2l/1, i2l/2, expr_to_term/1, term_to_expr/1,
- 	 queue_drop_while/2, queue_foldl/3, queue_foldr/3, queue_foreach/2]).
+ 	 l2i/1, i2l/1, i2l/2, expr_to_term/1, term_to_expr/1]).
  
  %% The following functions are used by gen_iq_handler.erl for providing backward
  %% compatibility and must not be used in other parts of the code
diff --cc src/mod_muc_admin.erl
index ef42d0b91,d94eb3086..23339e415
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@@ -483,8 -485,9 +485,9 @@@ create_room_with_opts(Name1, Host1, Ser
  			  Name,
  			  HistorySize,
  			  RoomShaper,
- 			  RoomOpts),
+ 			  RoomOpts,
+ 			  QueueType),
 -	    mod_muc:register_online_room(Host, Name, Pid),
 +	    mod_muc:register_online_room(Name, Host, Pid),
  	    ok;
  	{ok, _} ->
  	    error