summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-01-16 18:42:13 +0000
committerMatthias Radestock <matthias@lshift.net>2009-01-16 18:42:13 +0000
commitdaccae64614d5404edd2c3ec595b221f10ad34bf (patch)
tree2f490e5f7b4bb4a3e166b3eb5951ef7678e1055c /docs
parent116b4c434c754565388342e9d8ecf43bf9a17be9 (diff)
parent3bb4decb57c18d1ad382f5939ccb9f46c5ecb251 (diff)
downloadrabbitmq-server-git-daccae64614d5404edd2c3ec595b221f10ad34bf.tar.gz
merge default into bug20099
which involved a few conflict resolutions. The most complex of these was dealing with the termination of the limiter; we now unlink from it first so we don't get a spurious EXIT signal.
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions