summaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rabbitmq-mqtt-139Michael Klishin2017-06-2620-1210/+6942
|\
| * 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
| | * 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
| * | 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-261-128/+0
| * | vm_memory_monitor, rabbit_resource_monitor_misc: Move to rabbitmq-commonJean-Sébastien Pédron2017-06-262-587/+0
* | | CompileMichael Klishin2017-06-261-1/+1
* | | Log this as an error, provide more detailsMichael Klishin2017-06-261-1/+1
* | | SimplifyMichael Klishin2017-06-261-4/+1
* | | Merge branch 'master' into rabbitmq-mqtt-139Michael Klishin2017-06-263-9/+8
|\ \ \ | |/ /
| * | Merge branch 'stable'Jean-Sébastien Pédron2017-06-262-7/+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-211-1/+0
| * | Don't use export_allMichael Klishin2017-06-231-2/+4
* | | Pass in extra arguments to authentication backendArnaud Cogoluègnes2017-06-221-5/+48
|/ /
* | Merge branch 'stable'Jean-Sébastien Pédron2017-06-212-103/+103
|\ \ | |/
| * 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
* | Merge branch 'stable'Michael Klishin2017-06-194-26/+127
|\ \ | |/
| * Merge pull request #1259 from rabbitmq/rabbitmq-server-1223Michael Klishin2017-06-192-15/+124
| |\
| | * Merge branch 'stable' into rabbitmq-server-1223Michael Klishin2017-06-192-21/+21
| | |\
| | * | 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-141-3/+20
| | * | Use OS memory total when reporting memory usageDaniil Fedotov2017-06-141-8/+25
| | * | Current process system memory functions for various OSes.Daniil Fedotov2017-06-131-5/+16
| | * | Use system process rss memory when reporting vm memoryDaniil Fedotov2017-06-121-6/+73
| * | | Make term_to_binary_compat generate binaries using minor_version 1.Daniil Fedotov2017-06-162-11/+4
| | |/ | |/|
* | | Do not assume `#resource` is a 4-element tuple.Daniil Fedotov2017-06-131-1/+1
* | | Merge branch 'stable'Jean-Sébastien Pédron2017-06-132-21/+21
|\ \ \ | |/ /
| * | rabbit_node_monitor: Normalize indent and remove trailing spacesJean-Sébastien Pédron2017-06-131-20/+20
| * | rabbit: Remove trailing space in log messageJean-Sébastien Pédron2017-06-131-1/+1
| |/
* | Merge pull request #1258 from rabbitmq/rabbitmq-server-1257Michael Klishin2017-06-125-14/+114
|\ \
| * \ Merge branch 'master' into rabbitmq-server-1257Michael Klishin2017-06-121-22/+49
| |\ \
| * | | Locking support in cluster formationDiana Corbacho2017-06-095-14/+114
* | | | Merge branch 'stable'Daniil Fedotov2017-06-122-1/+33
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
View Lorry Controller Status