summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #711 from rabbitmq/rabbitmq-server-691Michael Klishin2016-04-050-0/+0
|\
| * Merge branch 'master' into rabbitmq-server-691Michael Klishin2016-04-051-2/+2
| |\
| * | Remove redundant linesDaniil Fedotov2016-04-051-4/+0
| * | Remove start arguments logDaniil Fedotov2016-04-041-2/+0
| * | Unquoting and extension trimming in windows scriptsDaniil Fedotov2016-04-043-9/+11
| * | Merge branch 'master' into rabbitmq-server-691Michael Klishin2016-04-033-2/+17
| |\ \
| * | | Support extension in advanced.configDaniil Fedotov2016-04-013-5/+18
| * | | Equality operators and trimming extensionDaniil Fedotov2016-03-311-11/+3
| * | | Condition ordering to set RABBITMQ_CONFIG_ARGDaniil Fedotov2016-03-313-36/+37
| * | | Strip off trailing .conf/.config using dirname and basenameMichael Klishin2016-03-311-1/+9
| * | | Merge branch 'master' into rabbitmq-server-691Michael Klishin2016-03-301-6/+6
| |\ \ \
| * | | | Remove debug echoesDaniil Fedotov2016-03-291-2/+0
| * | | | Support extensions in config filesDaniil Fedotov2016-03-295-40/+115
* | | | | Remove redundant linesDaniil Fedotov2016-04-051-4/+0
* | | | | Remove start arguments logDaniil Fedotov2016-04-051-2/+0
* | | | | Unquoting and extension trimming in windows scriptsDaniil Fedotov2016-04-053-9/+11
* | | | | Support extension in advanced.configDaniil Fedotov2016-04-053-5/+18
* | | | | Equality operators and trimming extensionDaniil Fedotov2016-04-051-11/+3
* | | | | Condition ordering to set RABBITMQ_CONFIG_ARGDaniil Fedotov2016-04-053-36/+37
* | | | | Strip off trailing .conf/.config using dirname and basenameMichael Klishin2016-04-051-1/+9
* | | | | Remove debug echoesDaniil Fedotov2016-04-051-2/+0
* | | | | Support extensions in config filesDaniil Fedotov2016-04-055-40/+115
* | | | | Merge branch 'stable'Michael Klishin2016-04-051-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #726 from rabbitmq/rabbitmq-management-166rabbitmq_v3_6_2_milestone3Michael Klishin2016-04-051-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'stable' into rabbitmq-management-166Michael Klishin2016-04-051-2/+2
| | |\ \ \ \ \
| | * | | | | | Update owner of mgmt_db tablesDiana Corbacho2016-04-051-1/+1
* | | | | | | | Merge branch 'stable'Michael Klishin2016-04-054-12/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge pull request #728 from rabbitmq/rabbitmq-server-210Michael Klishin2016-04-054-12/+9
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Override CONF_ENV_FILE with RABBITMQ_CONF_ENV_FILEDaniil Fedotov2016-04-054-12/+9
| |/ / / / /
* | | | | | Merge branch 'stable'Michael Klishin2016-04-051-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge pull request #724 from binarin/rabbitmq-server-ocf-reset-mnesia-overquo...Michael Klishin2016-04-051-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix half-hearted attempt to erase mnesia in OCF RAAlexey Lebedeff2016-04-041-2/+2
* | | | | Merge branch 'stable'Jean-Sébastien Pédron2016-04-012-1/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #715 from binarin/rabbitmq-server-151Jean-Sébastien Pédron2016-04-012-1/+16
| |\ \ \ \ | | |/ / /
| | * | | Guess thread pool size on startupAlexey Lebedeff2016-03-302-1/+16
* | | | | Merge branch 'stable'Michael Klishin2016-04-011-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge pull request #721 from rabbitmq/rabbitmq-server-717Michael Klishin2016-04-011-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Allow memory-relative disk-free limits greater than 1.0Brandon Shroyer2016-03-311-1/+1
| |/ /
* | | Update rabbitmq.conf.exampleMichael Klishin2016-03-291-6/+6
| |/ |/|
* | Fixing merge issue. Create advanced config instead of config file for use in ...Daniil Fedotov2016-03-291-6/+7
* | Merge branch 'stable'rabbitmq_v3_7_0_milestone2Michael Klishin2016-03-251-4/+3
|\ \ | |/
| * Merge pull request #708 from rabbitmq/rabbitmq-server-705rabbitmq_v3_6_2_milestone2Michael Klishin2016-03-251-4/+3
| |\
| | * fix RABBITMQ_IO_THREAD_POOL_SIZEGabriele Santomaggio2016-03-251-4/+3
| |/
* | Merge branch 'stable'Michael Klishin2016-03-252-5/+27
|\ \ | |/
| * Merge branch 'binarin-rabbitmq-server-688' into stableMichael Klishin2016-03-252-5/+27
| |\
| | * Merge branch 'rabbitmq-server-688' of https://github.com/binarin/rabbitmq-ser...Michael Klishin2016-03-242-5/+27
| | |\ | |/ /
| | * Add support for listing up/down queuesAlexey Lebedeff2016-03-242-5/+27
* | | Merge branch 'stable'Michael Klishin2016-03-241-8/+19
|\ \ \ | |/ /
| * | Merge branch 'binarin-rabbitmq-server-701' into stableMichael Klishin2016-03-240-0/+0
| |\ \
| | * \ Merge branch 'rabbitmq-server-701' of https://github.com/binarin/rabbitmq-ser...Michael Klishin2016-03-240-0/+0
| | |\ \