diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-12-01 14:12:57 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-12-01 14:12:57 +0300 |
| commit | 445f44a4db371b16c35f31667a3175d30697ff84 (patch) | |
| tree | 575155b0268336a6e0aafba493ea84dc0ae31b7b /include | |
| parent | 8401de2f41fad32a887a648265faf9b32542b0f1 (diff) | |
| parent | ad04a73e8ba3157e8b737f1521b1c4946c1d30e6 (diff) | |
| download | rabbitmq-server-git-445f44a4db371b16c35f31667a3175d30697ff84.tar.gz | |
Merge branch 'stable'
Conflicts:
src/rabbit_log.erl
src/rabbit_vm.erl
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions