diff options
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 6 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/changelog | 12 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 5f26141798..7a97556d29 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -123,6 +123,12 @@ done rm -rf %{buildroot} %changelog +* Tue Jun 25 2013 tim@rabbitmq.com 3.1.3-1 +- New Upstream Release + +* Mon Jun 24 2013 tim@rabbitmq.com 3.1.2-1 +- New Upstream Release + * Mon May 20 2013 tim@rabbitmq.com 3.1.1-1 - Test release diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index 8dffefb0af..fda29e7d35 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -1,3 +1,15 @@ +rabbitmq-server (3.1.3-1) unstable; urgency=low + + * New Upstream Release + + -- Tim Watson <tim@rabbitmq.com> Tue, 25 Jun 2013 15:01:12 +0100 + +rabbitmq-server (3.1.2-1) unstable; urgency=low + + * New Upstream Release + + -- Tim Watson <tim@rabbitmq.com> Mon, 24 Jun 2013 11:16:41 +0100 + rabbitmq-server (3.1.1-1) unstable; urgency=low * Test release diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index c790a12df7..3e3de10bbe 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -551,7 +551,7 @@ attempt_delivery(Delivery = #delivery{sender = SenderPid, message = Message}, {published, BQS1} -> {true, State#q{backing_queue_state = BQS1}}; {discarded, BQS1} -> - {false, State#q{backing_queue_state = BQS1}} + {true, discard(Delivery, State#q{backing_queue_state = BQS1})} end. deliver_or_enqueue(Delivery = #delivery{message = Message, sender = SenderPid}, |