summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable'Michael Klishin2015-10-211-8/+9
|\
| * Merge pull request #374 from bogdando/ra_ocf_haMichael Klishin2015-10-211-8/+9
| |\ | | | | | | More OCF HA fixes ported from OpenStack Fuel
| | * Fix piped exit codes expectations and count processingBogdan Dobrelya2015-10-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix return code of the get_all_pacemaker_nodes() and get_alive_pacemaker_nodes_but() to be not provided as ignored anyway. * Fix return code expectation of the fetched count attribute in the check_timeouts(). (Fuel related bug) Closes-bug: #1506440 Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
| | * Fix the timeout arg for the su_rabbit_cmdBogdan Dobrelya2015-10-211-4/+5
| |/ | | | | | | | | | | | | | | | | And fix local bashisms as a little bonus (Fuel related bug) Related-bug: #1464637 Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
* | Merge branch 'stable'rabbitmq_v3_6_0_milestone1Jean-Sébastien Pédron2015-10-201-1/+1
|\ \ | |/
| * description/0 is not a behaviour callbackJean-Sébastien Pédron2015-10-201-1/+1
| | | | | | | | | | The -ifdef(use_specs) part was correct, but the -else part was incorrect compared to it.
* | Merge pull request #367 from rabbitmq/rabbitmq-server-366Michael Klishin2015-10-192-9/+51
|\ \ | | | | | | fixes batch_publish_delivered for priority queues
| * | renames according to priority queue internal APIAlvaro Videla2015-10-172-9/+9
| | |
| * | fixes rabbit_priority_queue:batch_publish_delivery/4Alvaro Videla2015-10-172-8/+50
| | |
* | | Merge branch 'stable'Michael Klishin2015-10-161-1/+1
|\ \ \ | | |/ | |/|
| * | Merge pull request #365 from bogdando/ra_ocf_haMichael Klishin2015-10-161-1/+1
| |\ \ | | | | | | | | Sync lost change from Fuel HA rabbitmq OCF fixes
| | * | Sync lost change from Fuel HA rabbitmq OCF fixesBogdan Dobrelya2015-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missed change for the return value from the fix: 5097d94 - Bogdan Dobrelya, 3 months ago : Fix error return codes for rabbit OCF Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
* | | | Merge branch 'stable'Michael Klishin2015-10-161-33/+252
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #364 from bogdando/ra_ocf_haMichael Klishin2015-10-161-33/+252
| |\ \ | | |/ | | | Port Fuel fixes for the HA rabbitmq OCF
| | * Port Fuel fixes for the HA rabbitmq OCFBogdan Dobrelya2015-10-161-33/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync OCF script changes and fixes from Fuel, version 8.0dev/9ca5b6709cd18c8134cd8feaccf937ef49a625b4 Changelog brief: 9ca5b67 - Matthew Mosesohn, 8 days ago : Wait for rabbitmq sync before stop/demote actions 00a6a01 - Davanum Srinivas, 4 days ago : Avoid division operation in shell c1900b4 - Dmitry Mescheryakov, 4 weeks ago : Start RabbitMQ app on notify 00f28b5 - Vladimir Kuklin, 4 weeks ago : Return NOT_RUNNING when beam is not RUNNING 2707a5e - Dmitry Mescheryakov, 7 weeks ago : Make RabbitMQ OCF script tolerate rabbitmqctl timeouts 403b28c - Bogdan Dobrelya, 6 weeks ago : Detect a last man standing for rabbit OCF agent 60d5743 - Victor Sergeyev, 7 weeks ago : Add more logs to rabbitmq get_status function 11c4e4c - Alex Schultz, 9 weeks ago : Fix rabbitmq data restore for large datasets 8ccdfc6 - Stanislav Makar, 6 months ago : Implement the dumping of rabbitMQ definitions 5097d94 - Bogdan Dobrelya, 3 months ago : Fix error return codes for rabbit OCF b5ae83a - Bogdan Dobrelya, 3 months ago : Fix chowning for rabbit OCF bf604f8 - Bogdan Dobrelya, 4 months ago : Restart rabbit if can't list queues or found memory alert Co-authored-by: Matthew Mosesohn <mmosesohn@mirantis.com> Co-authored-by: Davanum Srinivas <dsrinivas@mirantis.com> Co-authored-by: Vladimir Kuklin <vkuklin@mirantis.com> Co-authored-by: Dmitry Mescheryakov <dmescheryakov@mirantis.com> Co-authored-by: Victor Sergeyev <vsergeyev@mirantis.com> Co-authored-by: Alex Schultz <aschultz@mirantis.com> Co-authored-by: Makar Stanislav <smakar@mirantis.com> Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
* | | Merge pull request #361 from rabbitmq/rabbitmq-server-63Michael Klishin2015-10-151-1/+2
|\ \ \ | | | | | | | | Adds net_ticktime to rabbitmqctl status output.
| * | | Adds net_ticktime to rabbitmqctl status output.Ayanda Dube2015-10-151-1/+2
|/ / / | | | | | | | | | References #63
* | | Merge branch 'stable'Michael Klishin2015-10-142-5/+7
|\ \ \ | |/ /
| * | Merge pull request #360 from rabbitmq/rabbitmq-server-84Michael Klishin2015-10-142-5/+7
| |\ \ | | | | | | | | Move rabbit_mirror_queue_misc:all_nodes/0 to rabbit_nodes:all_running/0
| | * | Move rabbit_mirror_queue_misc:all_nodes/0 to rabbit_nodes:all_running/0Diana Corbacho2015-10-142-5/+7
| |/ /
* | | fixes gm_qc APIAlvaro Videla2015-10-141-2/+2
| | |
* | | fixes QuickCheck tests for rabbit_backing_queue_qcAlvaro Videla2015-10-141-4/+4
| | |
* | | Merge pull request #359 from rabbitmq/rabbitmq-server-358Michael Klishin2015-10-141-1/+2
|\ \ \ | | | | | | | | fixes failing test
| * | | fixes failing testAlvaro Videla2015-10-141-1/+2
|/ / /
* | | fixes batch_publish testsAlvaro Videla2015-10-141-5/+15
| | |
* | | Merge branch 'stable'Alvaro Videla2015-10-141-1/+1
|\ \ \ | |/ /
| * | restores the rabbit_variable_queue testsAlvaro Videla2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This line https://github.com/rabbitmq/rabbitmq-server/blob/master/src/rabbit_priority_queue.erl#L78 sets the rabbit_priority_queue as the default rabbit_backing_queue which had the side effect of disabling the tests for the rabbit_variable_queue
* | | Merge branch 'stable'Michael Klishin2015-10-130-0/+0
|\ \ \ | |/ /
| * | Merge pull request #356 from bogdando/ra_ocf_haMichael Klishin2015-10-133-1/+1649
| |\ \ | | |/ | | | Ra ocf ha
* | | Merge branch 'stable'Michael Klishin2015-10-131-4/+4
|\ \ \ | |/ /
| * | Merge pull request #354 from Jakauppila/rabbitmq-server-354Michael Klishin2015-10-131-4/+4
| |\ \ | | | | | | | | Allow ERLANG_HOME to be overridden from rabbitmq-env.bat
| | * | Move call rabbitmq-ev.batJared Kauppila2015-10-121-4/+4
| | | | | | | | | | | | Moving the rabbitmq-ev.bat call above the ERLANG_HOME check. This grants the ability to override ERLANG_HOME within rabbitmq-env-conf.bat.
* | | | Merge pull request #355 from rabbitmq/rabbitmq-server-112Michael Klishin2015-10-133-2/+8
|\ \ \ \ | | | | | | | | | | Read memory monitor interval from configuration
| * | | | Missing commaMichael Klishin2015-10-131-1/+1
| | | | |
| * | | | Read memory monitor interval from configurationDiana Corbacho2015-10-133-2/+8
|/ / / /
* | | | Merge pull request #344 from rabbitmq/rabbitmq-server-336Michael Klishin2015-10-129-117/+474
|\ \ \ \ | | | | | | | | | | Implements Mirror Queue Sync in Batches
| * | | | Move this constant closer to the only place it is usedMichael Klishin2015-10-121-2/+2
| | | | |
| * | | | removes non batch-sync code pathAlvaro Videla2015-10-101-46/+3
| | | | |
| * | | | fixes conflictsAlvaro Videla2015-10-101-1/+1
| |\ \ \ \
| | * | | | Clarify this commentMichael Klishin2015-10-101-1/+1
| | | | | |
| * | | | | refactors message sync'ing in batchesAlvaro Videla2015-10-101-27/+54
| | | | | |
| * | | | | send msg batch in proper orderAlvaro Videla2015-10-101-1/+1
| | | | | |
| * | | | | get into account unacked messages when syncingAlvaro Videla2015-10-101-1/+1
| | | | | |
| * | | | | adds default sync batch size on the app configAlvaro Videla2015-10-102-3/+8
| |/ / / /
| * | | | removes unused constantAlvaro Videla2015-10-101-2/+0
| | | | |
| * | | | WordingMichael Klishin2015-10-101-1/+1
| | | | |
| * | | | Merge branch 'master' into rabbitmq-server-336Michael Klishin2015-10-106-14/+26
| |\ \ \ \
| * | | | | restores new lineAlvaro Videla2015-10-051-0/+1
| | | | | |
| * | | | | improves commentAlvaro Videla2015-10-051-2/+3
| | | | | |
| * | | | | Merge branch 'master' into rabbitmq-server-336Alvaro Videla2015-10-056-42/+148
| |\ \ \ \ \
View Lorry Controller Status