summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update rabbitmq-components.mkJean-Sébastien Pédron2015-11-201-0/+7
* Merge pull request #430 from rabbitmq/rabbitmq-server-429Michael Klishin2015-11-194-43/+34
|\
| * Merge branch 'master' into rabbitmq-server-429Michael Klishin2015-11-1910-322/+261
| |\
| * | removes unused exportAlvaro Videla2015-11-191-3/+0
| * | adds missing state paramAlvaro Videla2015-11-191-1/+1
| * | refactor handling of acks after batch_publish_deliveredAlvaro Videla2015-11-184-40/+34
* | | Merge pull request #432 from rabbitmq/rabbitmq-server-428Michael Klishin2015-11-192-32/+1
|\ \ \ | |_|/ |/| |
| * | rabbit_ctl_misc => rabbit_control_miscAyanda Dube2015-11-191-1/+1
| * | Discards 'rabbit_ctl_misc.erl'Ayanda Dube2015-11-191-31/+0
* | | Merge branch 'stable'Michael Klishin2015-11-190-0/+0
|\ \ \
| * \ \ Merge pull request #431 from binarin/rabbitmq-common-pmon-contract-breachMichael Klishin2015-11-191-1/+1
| |\ \ \
| | * | | Make pmon:demonitor/2 respect its contractAlexey Lebedeff2015-11-191-1/+1
| |/ / /
* | | | Merge pull request #414 from rabbitmq/rabbitmq-server-260Michael Klishin2015-11-198-228/+57
|\ \ \ \
| * \ \ \ Merge branch 'master' into rabbitmq-server-260Michael Klishin2015-11-191-3/+3
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Update erlang.mkJean-Sébastien Pédron2015-11-191-3/+3
| |_|/ / |/| | |
| * | | Merge branch 'master' into rabbitmq-server-260Michael Klishin2015-11-192-94/+204
| |\ \ \ | |/ / / |/| | |
* | | | Update erlang.mkJean-Sébastien Pédron2015-11-181-21/+6
* | | | Update erlang.mkJean-Sébastien Pédron2015-11-182-74/+199
| |_|/ |/| |
| * | Merge branch 'master' into rabbitmq-server-260Michael Klishin2015-11-189-42/+355
| |\ \ | |/ / |/| |
* | | Merge pull request #377 from rabbitmq/rabbitmq-server-351Michael Klishin2015-11-186-22/+306
|\ \ \
| * \ \ Merge branch 'master' into rabbitmq-server-351Michael Klishin2015-11-174-20/+49
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'stable'Michael Klishin2015-11-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #424 from mattymo/host_ip_paramMichael Klishin2015-11-161-1/+10
| |\ \ \
| | * | | Add host_ip fieldMatthew Mosesohn2015-11-161-1/+10
| |/ / /
* | | | Merge pull request #425 from rabbitmq/rabbitmq-server-417Michael Klishin2015-11-161-2/+14
|\ \ \ \
| * | | | makes sures the aggregator process doesn't hangAlvaro Videla2015-11-161-2/+14
* | | | | Add host_ip fieldMatthew Mosesohn2015-11-161-1/+10
|/ / / /
* | | | Merge pull request #422 from rabbitmq/rabbitmq-server-420Michael Klishin2015-11-131-13/+7
|\ \ \ \
| * | | | refactors credit flow codeAlvaro Videla2015-11-131-13/+7
|/ / / /
* | | | Merge branch 'rabbitmq-server-80'Jean-Sébastien Pédron2015-11-131-1/+1
|\ \ \ \
| * | | | packaging/windows-exe: Append version to program name in "Add/Remove Programs"Jean-Sébastien Pédron2015-11-131-1/+1
|/ / / /
* | | | packaging/windows-exe: Use rabbitmq.ico in the "Add/Remove Programs" windowJean-Sébastien Pédron2015-11-131-1/+1
* | | | packaging/windows-exe: Remove \Program Files\RabbitMQ Server on uninstallJean-Sébastien Pédron2015-11-131-0/+1
* | | | packaging/windows-exe: Always install in \Program FilesJean-Sébastien Pédron2015-11-131-2/+15
| | * | Merge branch 'master' into rabbitmq-server-351Alvaro Videla2015-11-12124-22149/+8673
| | |\ \ | |_|/ / |/| | |
| | * | fixes typosAlvaro Videla2015-10-232-5/+5
| | * | removes whitespaceAlvaro Videla2015-10-211-1/+0
| | * | typoAlvaro Videla2015-10-211-1/+1
| | * | fixes testAlvaro Videla2015-10-201-1/+1
| | * | Merge branch 'master' into rabbitmq-server-351Alvaro Videla2015-10-207-50/+314
| | |\ \
| | * | | adds policy validator testsAlvaro Videla2015-10-201-0/+15
| | * | | adds lazy queue testsAlvaro Videla2015-10-192-25/+96
| | * | | fixes queue transition from default to lazyAlvaro Videla2015-10-161-4/+4
| | * | | Merge branch 'master' into rabbitmq-server-351Alvaro Videla2015-10-142-6/+6
| | |\ \ \
| | * \ \ \ Merge branch 'master' into rabbitmq-server-351Alvaro Videla2015-10-141-1/+2
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into rabbitmq-server-351Alvaro Videla2015-10-145-12/+28
| | |\ \ \ \ \
| | * | | | | | fixes stats/delta handling on publish_deliveredAlvaro Videla2015-10-141-7/+3
| | * | | | | | fixes stats for lazy publish deliveredAlvaro Videla2015-10-131-2/+1
| | * | | | | | cosmeticsAlvaro Videla2015-10-131-1/+2
| | * | | | | | brings comments up to dateAlvaro Videla2015-10-131-6/+4