summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-06-07 19:34:19 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-06-07 19:34:19 +0300
commitd6fedd2329c2561f73e7b59bb6e3434d1504971d (patch)
tree51e594fd29a8e2a66d126053dd7a997bebfc5cdf /src
parentcdc8746f4a3f29ab5649f5c9a110a3b46a0c23fe (diff)
parentd6d9e9824c3284efb9fd9b166686dc0e84fe4451 (diff)
downloadrabbitmq-server-git-d6fedd2329c2561f73e7b59bb6e3434d1504971d.tar.gz
Merge branch 'stable'
Conflicts: docs/rabbitmq.config.example
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions