Merge branch 'dgelvin/master'

Conflicts:
	kombu/messaging.py
This commit is contained in:
Ask Solem 2010-10-06 09:14:49 +02:00
commit 36dd024386
1 changed files with 1 additions and 1 deletions

View File

@ -74,7 +74,7 @@ class Message(object):
if self.acknowledged:
raise self.MessageStateError(
"Message already acknowledged with state: %s" % self._state)
self.channel.basic_reject(self.delivery_tag)
self.channel.basic_reject(self.delivery_tag, requeue=False)
self._state = "REJECTED"
def requeue(self):