summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore callgraph.dot*Michael Klishin2017-06-271-0/+1
* Log when Looking Glass is enabledMichael Klishin2017-06-271-0/+1
* Merge branch 'master' into rabbitmq-common-198Michael Klishin2017-06-2757-1283/+7751
|\
| * Merge branch 'stable'Michael Klishin2017-06-272-21/+1
| |\
| | * Merge pull request #1275 from rabbitmq/add-otp-version-to-server-propertiesMichael Klishin2017-06-271-1/+1
| | |\
| | | * Add OTP version to server properties during connection negotiationGerhard Lazu2017-06-261-1/+1
| | |/
| | * Remove dead testsGerhard Lazu2017-06-261-20/+0
| * | Merge branch 'stable'Jean-Sébastien Pédron2017-06-261-15/+1
| |\ \ | | |/
| | * rabbit_nodes_common: Move ensure_epmd() from rabbitmq-serverJean-Sébastien Pédron2017-06-261-15/+1
| * | unit_SUITE: Move auth_backend_internal_expand_topic_permission() from rabbitm...Jean-Sébastien Pédron2017-06-261-0/+35
| * | Merge branch 'stable'Jean-Sébastien Pédron2017-06-260-0/+0
| |\ \ | | |/
| | * Merge branch 'resolve-deps-circles' into stableJean-Sébastien Pédron2017-06-2620-1190/+6502
| | |\
| | | * Move rabbit_net:accept_ack() to rabbit_networkingJean-Sébastien Pédron2017-06-262-2/+20
| | | * rabbit_auth_backend_internal: with_user_and_vhost() was movedJean-Sébastien Pédron2017-06-261-3/+3
| | | * Move modules which don't belong to rabbitmq-common hereJean-Sébastien Pédron2017-06-2610-0/+4464
| | | * rabbit_vhost: Move with_user_and_vhost/3 from rabbit_misc in rabbitmq-commonJean-Sébastien Pédron2017-06-261-1/+6
| | | * mnesia_sync: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-261-73/+0
| | | * worker_pool: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-263-421/+0
| | | * Move rabbit_networking and rabbit_reader from rabbitmq-commonJean-Sébastien Pédron2017-06-262-0/+2014
| | | * rabbit_log: Move it from rabbitmq-server to rabbitmq-commonJean-Sébastien Pédron2017-06-261-108/+0
| | | * vm_memory_monitor, rabbit_resource_monitor_misc: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-262-587/+0
| | |/
| * | Merge branch 'resolve-deps-circles-in-master'Jean-Sébastien Pédron2017-06-2621-1211/+6956
| |\ \
| | * | Move rabbit_net:accept_ack() to rabbit_networkingJean-Sébastien Pédron2017-06-262-2/+20
| | * | rabbit_auth_backend_internal: with_user_and_vhost() was movedJean-Sébastien Pédron2017-06-261-7/+7
| | * | Move modules which don't belong to rabbitmq-common hereJean-Sébastien Pédron2017-06-2610-0/+4817
| | * | rabbit_vhost: Move with_user_and_vhost/3 from rabbit_misc in rabbitmq-commonJean-Sébastien Pédron2017-06-261-1/+6
| | * | mnesia_sync: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-261-73/+0
| | * | worker_pool: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-263-421/+0
| | * | Move rabbit_networking and rabbit_reader from rabbitmq-commonJean-Sébastien Pédron2017-06-262-0/+2115
| | * | rabbit_log: Move it from rabbitmq-server to rabbitmq-commonJean-Sébastien Pédron2017-06-262-129/+0
| | * | vm_memory_monitor, rabbit_resource_monitor_misc: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-262-587/+0
| |/ /
| * | Merge branch 'stable'Jean-Sébastien Pédron2017-06-264-18/+27
| |\ \ | | |/
| | * Fix log_management test in OTP 20Gerhard Lazu2017-06-221-1/+1
| | * Remove duplicate READMEGerhard Lazu2017-06-211-1/+0
| | * Merge pull request #1270 from rabbitmq/rabbitmq-server-1223-fixMichael Klishin2017-06-211-6/+4
| | |\
| | | * Use wmic instead of tasklist to get Windows process memoryLuke Bakken2017-06-211-6/+4
| | |/
| | * Fix term_to_binary_compat tests in R16B03Jean-Sébastien Pedron2017-06-212-11/+23
| * | Add a mapping for ssl_options.honor_ecc_orderMichael Klishin2017-06-232-0/+43
| * | Don't use export_allMichael Klishin2017-06-231-2/+4
| * | Merge branch 'stable'Jean-Sébastien Pédron2017-06-213-111/+117
| |\ \ | | |/
| | * rabbit_vm, vm_memory_monitor: Use spaces to indentJean-Sébastien Pédron2017-06-212-8/+7
| | * Move total_memory() from rabbit_vm to vm_memory_monitorJean-Sébastien Pédron2017-06-212-101/+102
| | * Improve naming for test iterations & properties which are testedrabbitmq_v3_6_11_milestone2Gerhard Lazu2017-06-201-7/+13
| | * Fix binary comparison in OTP R16B03Gerhard Lazu2017-06-201-1/+1
| * | Merge branch 'stable'Michael Klishin2017-06-196-39/+174
| |\ \ | | |/
| | * Merge pull request #1259 from rabbitmq/rabbitmq-server-1223Michael Klishin2017-06-193-15/+125
| | |\
| | | * Merge branch 'stable' into rabbitmq-server-1223Michael Klishin2017-06-195-22/+89
| | | |\
| | | * | Move function that reports total used memoryDaniil Fedotov2017-06-152-100/+97
| | | * | Change vm_memory_use_process_rss config to vm_memory_calculation_strategyDaniil Fedotov2017-06-142-4/+21
| | | * | Use OS memory total when reporting memory usageDaniil Fedotov2017-06-141-8/+25