summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore *.plt filesMichael Klishin2015-11-221-0/+3
* Merge branch 'stable'Michael Klishin2015-11-221-7/+7
|\
| * Merge pull request #440 from rabbitmq/rabbitmq-server-438Michael Klishin2015-11-221-7/+7
| |\
| | * addresses dialyzer warningsAlvaro Videla2015-11-201-7/+7
| |/
* | packaging/windows-exe: Use ExecDos plugin to run batch filesJean-Sébastien Pédron2015-11-202-6/+10
* | packaging/windows-exe: Fix quoting of uninstall.exeJean-Sébastien Pédron2015-11-201-1/+1
* | Merge branch 'rabbitmq-server-264'Jean-Sébastien Pédron2015-11-201-3/+63
|\ \
| * | packaging/windows-exe: Allow silent installRyan Zink2015-11-201-3/+63
|/ /
* | packaging/windows-exe: Wait for uninstall to finish before installingJean-Sébastien Pédron2015-11-201-1/+3
* | Merge pull request #439 from rabbitmq/rabbitmq-server-435Michael Klishin2015-11-201-5/+4
|\ \
| * | Fix memory reporting for connectionsLoïc Hoguin2015-11-201-5/+4
* | | Merge branch 'stable'Michael Klishin2015-11-201-3/+5
|\ \ \ | | |/ | |/|
| * | Merge pull request #437 from rabbitmq/rabbitmq-server-436Michael Klishin2015-11-201-3/+5
| |\ \
| | * | fixes clear_read_cache get_env handlingAlvaro Videla2015-11-201-3/+5
| |/ /
* | | Makefile: Fix how we modify an autopatched erlang.mkJean-Sébastien Pédron2015-11-201-4/+4
| |/ |/|
* | Merge branch 'stable'Jean-Sébastien Pédron2015-11-201-1/+1
|\ \ | |/
| * Use erlang:min/2, not min/2 which is not available in Erlang R13B03Jean-Sébastien Pédron2015-11-201-1/+1
* | Makefile: Required Ranch version was moved to rabbitmq-components.mkJean-Sébastien Pédron2015-11-201-1/+0
* | 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