summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bug26638'Simon MacMullen2015-03-111-2/+1
|\
| * More reliable way to find the erl executable.Simon MacMullen2015-03-111-2/+1
|/
* RPM/deb changelogs for release 3.5.0Jean-Sébastien Pédron2015-03-112-0/+9
* Ignore ./etc/*Michael Klishin2015-03-111-0/+1
* Merge branch 'bug26636'Simon MacMullen2015-03-102-6/+20
|\
| * Rename things to be slightly clearerSimon MacMullen2015-03-101-3/+3
| * rabbit_node_monitor: Exclude Mnesia-synced nodes when clearing partitionsJean-Sébastien Pédron2015-03-101-1/+3
| * rabbit_node_monitor: In handle_dead_rabbit(), consider node down onceJean-Sébastien Pédron2015-03-091-4/+12
| * rabbit_networking: In on_node_down(), don't remove listeners if node is backJean-Sébastien Pédron2015-03-091-1/+5
|/
* Merge branch 'bug26633'Simon MacMullen2015-03-061-2/+16
|\
| * Partial partition: Don't act if pause_if_all_down is about to pauseJean-Sébastien Pédron2015-03-051-2/+16
* | Merge branch 'bug26632'Jean-Sébastien Pédron2015-03-062-19/+40
|\ \ | |/ |/|
| * Autoheal: Wait for current outside app. process to finishJean-Sébastien Pédron2015-03-052-19/+40
* | Merge branch 'bug26628'Simon MacMullen2015-03-051-43/+147
|\ \
| * | Autoheal: Add a restart_loser/2 functionJean-Sébastien Pédron2015-03-051-34/+38
| * | Autoheal: Document the protocol changeJean-Sébastien Pédron2015-03-041-3/+66
| * | Autoheal: The leader waits for "done!" message from the winnerJean-Sébastien Pédron2015-03-041-30/+67
* | | Add more explanatory text for timeout_waiting_for_tablesSimon MacMullen2015-03-051-2/+8
| |/ |/|
* | Merge branch 'bug26631'Jean-Sébastien Pédron2015-03-042-1/+67
|\ \ | |/ |/|
| * Workaround "global" hangJean-Sébastien Pédron2015-03-042-1/+67
|/
* Merge branch 'stable'Jean-Sébastien Pédron2015-03-031-21/+25
|\
| * Merge branch 'bug26622' into stableJean-Sébastien Pédron2015-03-031-10/+12
| |\
| | * rabbit_node_monitor: Cache pause_minority_guard() return valueJean-Sébastien Pédron2015-03-031-10/+12
* | | Merge branch 'stable'Simon MacMullen2015-02-262-44/+29
|\ \ \ | |/ /
| * | Fix tests, the exceptions are a bit cleaner now (bug26610)Simon MacMullen2015-02-261-9/+7
| * | Further cleanup of boot exception handling (bug26610)Simon MacMullen2015-02-261-35/+22
* | | Merge branch 'stable'Simon MacMullen2015-02-261-42/+35
|\ \ \ | |/ /
| * | Merge branch 'bug26610' into stableSimon MacMullen2015-02-261-42/+35
| |\ \
| | * | Detangle boot error handling, step 2Simon MacMullen2015-02-261-16/+24
| | * | Detangle boot error handling, step 1Simon MacMullen2015-02-261-20/+4
| | * | Fix clearer timeout_waiting_for_tables error messageSimon MacMullen2015-02-231-10/+11
| |/ /
* | | Merge branch 'stable'Simon MacMullen2015-02-260-0/+0
|\ \ \ | |/ /
| * | Ignore etagsMichael Klishin2015-02-211-0/+3
| |/
* | Merge pull request #52 from jeckersb/sd_notify-for-upstreamMichael Klishin2015-02-261-0/+5
|\ \
| * | Add systemd notification supportJohn Eckersberg2015-02-251-0/+5
* | | Merge pull request #55 from rabbitmq/bug26614Michael Klishin2015-02-253-3/+3
|\ \ \
| * | | When ERLANG_HOME is not set, exit with code 1Michael Klishin2015-02-253-3/+3
|/ / /
* | | Merge branch 'bug26465'Simon MacMullen2015-02-233-29/+77
|\ \ \
| * | | pause_if_all_down: Remove configuration checkJean-Sébastien Pédron2015-02-201-32/+5
| * | | pause_if_all_down: Lower priority of "listed nodes not in the cluster" messageJean-Sebastien Pedron2015-02-031-2/+2
| * | | How to recover from partitioning after 'pause_if_all_down' is configurableJean-Sebastien Pedron2014-12-242-6/+15
| * | | Rename 'keep_preferred' to 'pause_if_all_down' and accept a list of nodesJean-Sebastien Pedron2014-12-191-30/+49
| * | | Add a new "keep_preferred" cluster partition handling methodJean-Sebastien Pedron2014-12-022-27/+74
* | | | Ignore etagsMichael Klishin2015-02-211-0/+1
* | | | Sync CONTRIBUTING.md with the template oneMichael Klishin2015-02-201-1/+1
* | | | Merge branch 'stable'Jean-Sébastien Pédron2015-02-192-37/+35
|\ \ \ \ | | |_|/ | |/| |
| * | | Convert .hgignore to .gitignoreJean-Sébastien Pédron2015-02-192-35/+33
* | | | Merge remote-tracking branch 'origin/master'Simon MacMullen2015-02-191-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #53 from nilcons-contrib/fix-typoMichael Klishin2015-02-191-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix a hilarious typo in the example configMihaly Barasz2015-02-191-1/+1
| |/ / /