From b9507b0d6f64759e30e7f19569a1dfb33df95140 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Aug 25 2016 15:18:59 +0000
Subject: Fix issue added during rebase


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch b/rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch
index 756e670..e6c6fe9 100644
--- a/rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch
+++ b/rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch
@@ -15,7 +15,7 @@ Subject: [PATCH] Avoid RPC roundtrips while listing items
 Part of https://github.com/rabbitmq/rabbitmq-server/pull/683
 
 diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
-index 27b352a..38300bd 100644
+index 27b352a..e09e02c 100644
 --- a/src/rabbit_amqqueue.erl
 +++ b/src/rabbit_amqqueue.erl
 @@ -25,10 +25,10 @@
@@ -60,7 +60,7 @@ index 27b352a..38300bd 100644
  -spec stat(rabbit_types:amqqueue()) ->
            {'ok', non_neg_integer(), non_neg_integer()}.
  -spec delete_immediately(qpids()) -> 'ok'.
-@@ -627,16 +623,23 @@ info_all(VHostPath, Items) ->
+@@ -627,16 +623,18 @@ info_all(VHostPath, Items) ->
      map(list(VHostPath), fun (Q) -> info(Q, Items) end) ++
          map(list_down(VHostPath), fun (Q) -> info_down(Q, Items, down) end).
  
@@ -86,15 +86,10 @@ index 27b352a..38300bd 100644
 +    rabbit_control_misc:emitting_map_with_exit_handler(
 +      AggregatorPid, Ref, fun(Q) -> info_down(Q, Items, down) end,
 +      list_down(VHostPath)).
-+
-+list_local(VHostPath) ->
-+    [ Q || #amqqueue{state = State, pid=QPid} = Q <- list(VHostPath),
-+           State =/= crashed,
-+           node() =:= node(QPid) ].
  
  info_local(VHostPath) ->
      map(list_local(VHostPath), fun (Q) -> info(Q, [name]) end).
-@@ -664,12 +667,17 @@ consumers_all(VHostPath) ->
+@@ -664,12 +662,17 @@ consumers_all(VHostPath) ->
        map(list(VHostPath),
            fun(Q) -> get_queue_consumer_info(Q, ConsumerInfoKeys) end)).