Merge branch 'master' into rabbitmq-server-500

.travis.yml

@@ -11,6 +11,7 @@ addons:
       - xsltproc
 otp_release:
   - "18.3"
+  - "19.0"
 env:
   matrix:
   - GROUP=1
@@ -30,7 +31,7 @@ before_script:
     git fetch upstream master:master || :
 
 script:
-  - if test "${GROUP}" = '1'; then make tests CT_OPTS+='-verbosity 50'; fi
+  - if test "${GROUP}" = '1'; then make tests; fi
   - if test "${GROUP}" = '2'; then sh ./scripts/travis_test_ocf_ra.sh; fi
 
 cache:

Makefile

@@ -26,8 +26,6 @@ DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \
 	      rabbit_common/mk/rabbitmq-dist.mk \
 	      rabbit_common/mk/rabbitmq-tools.mk
 
-CT_OPTS += -ct_hooks cth_surefire
-
 # FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be
 # reviewed and merged.
 

packaging/RPMS/Fedora/rabbitmq-server.spec

@@ -126,6 +126,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jul 6 2016 michael@rabbitmq.com 3.6.3-1
+- New Upstream Release
+
 * Thu May 19 2016 michael@rabbitmq.com 3.6.2-1
 - New Upstream Release
 

packaging/debs/Debian/debian/changelog

@@ -1,3 +1,9 @@
+rabbitmq-server (3.6.3-1) unstable; urgency=low
+
+  * New Upstream Release
+
+ -- Michael Klishin <michael@rabbitmq.com>  Wed, 06 Jul 2016 19:19:21 +0100
+
 rabbitmq-server (3.6.2-1) unstable; urgency=low
 
   * New Upstream Release

src/lqueue.erl

@@ -27,7 +27,7 @@
 
 -export_type([?MODULE/0]).
 
--opaque ?MODULE() :: {non_neg_integer(), ?QUEUE:?QUEUE()}.
+-opaque ?MODULE() :: {non_neg_integer(), queue:queue()}.
 -type value()     :: any().
 -type result()    :: 'empty' | {'value', value()}.
 

src/rabbit_mirror_queue_master.erl

@@ -61,11 +61,11 @@
                                  confirmed           :: [rabbit_guid:guid()],
                                  known_senders       :: sets:set()
                                }.
-
 -spec promote_backing_queue_state
         (rabbit_amqqueue:name(), pid(), atom(), any(), pid(), [any()],
          dict:dict(), [pid()]) ->
             master_state().
+
 -spec sender_death_fun() -> death_fun().
 -spec depth_fun() -> depth_fun().
 -spec init_with_existing_bq(rabbit_types:amqqueue(), atom(), any()) ->