summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* packaging/windows-exe: Allow silent installRyan Zink2015-11-201-3/+63
| | | | | | While here, do not remove `ERLANG_HOME` on a reinstall/upgrade process. Fixes #264.
* 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 connections
| * Fix memory reporting for connectionsLoïc Hoguin2015-11-201-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, there was two parts of the supervision tree: one for the listener/acceptor, and one for connections. The latter was one big supervisor handling all connections, regardless of the listener they were coming from. With Ranch, each listener has its own branch in the supervision tree. Inside it are then two more branches, one for the acceptors and one for the connections. The fix simply adds all Ranch connection supervisors to the list by fetching them from the ranch_server ETS table.
* | 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 handling
| | * | 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
| |/ |/| | | | | | | This fixes package builds when eg. ranch was pulled from a sub-repository instead of from the Umbrella.
* | 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
|\ \ | | | | | | Refactors AckTags handling for mirror_queue_sync
| * \ 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
|\ \ \ \ | |_|/ / |/| | | Discards rabbit_ctl_misc and updates its references
| * | | rabbit_ctl_misc => rabbit_control_miscAyanda Dube2015-11-191-1/+1
| | | | | | | | | | | | | | | | References #428
| * | | Discards 'rabbit_ctl_misc.erl'Ayanda Dube2015-11-191-31/+0
| | | | | | | | | | | | | | | | References #428
* | | | Merge branch 'stable'Michael Klishin2015-11-190-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: src/pmon.erl
| * | | Merge pull request #431 from binarin/rabbitmq-common-pmon-contract-breachMichael Klishin2015-11-191-1/+1
| |\ \ \ | | | | | | | | | | Make pmon:demonitor/2 respect its contract
| | * | | Make pmon:demonitor/2 respect its contractAlexey Lebedeff2015-11-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Spec states that demonitor/2 should always return #state{}, but it wasn't the case when pid wasn't found in #state.dict. This made API unsafe to use, as it could lead to some other process storing incorrect data as a pmon state.
* | | | Merge pull request #414 from rabbitmq/rabbitmq-server-260Michael Klishin2015-11-198-228/+57
|\ \ \ \ | | | | | | | | | | Use Ranch for TCP acceptor pool
| * \ \ \ 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
|\ \ \ | | | | | | | | Implements Lazy Queues
| * \ \ 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 field
| | * | | Add host_ip fieldMatthew Mosesohn2015-11-161-1/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working with RMQ definitions via management plugin requires knowing the IP address where it listens. host_ip parameter will default to 127.0.0.1, but is configurable.
* | | | Merge pull request #425 from rabbitmq/rabbitmq-server-417Michael Klishin2015-11-161-2/+14
|\ \ \ \ | | | | | | | | | | makes sures the aggregator process doesn't hang
| * | | | makes sures the aggregator process doesn't hangAlvaro Videla2015-11-161-2/+14
| | | | |
* | | | | Add host_ip fieldMatthew Mosesohn2015-11-161-1/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Working with RMQ definitions via management plugin requires knowing the IP address where it listens. host_ip parameter will default to 127.0.0.1, but is configurable.
* | | | Merge pull request #422 from rabbitmq/rabbitmq-server-420Michael Klishin2015-11-131-13/+7
|\ \ \ \ | | | | | | | | | | refactors credit flow code
| * | | | 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
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is already a key dedicated to the product version. But apparently, this is not easy when automating things. Moreover, most aplications I checked have the version appended to the product name so this is a common practice. Fixes #80.
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... even on 64-bit Windows (instead of `\Program Files (x86)` previoously). This change of directory takes effect for new installs only, not for updates.
| | * | 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
| | | |