summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into rabbitmq-mqtt-139Michael Klishin2017-06-267-20/+74
|\
| * 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
* | | Pass in extra arguments to authentication backendArnaud Cogoluègnes2017-06-223-6/+96
|/ /
* | 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
| | * | 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-122-6/+74
| * | | Merge pull request #1268 from rabbitmq/rabbitmq-server-1243Michael Klishin2017-06-183-24/+50
| |\ \ \
| | * \ \ Merge branch 'stable' into rabbitmq-server-1243Michael Klishin2017-06-171-1/+1
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Make term_to_binary_compat generate binaries using minor_version 1.Daniil Fedotov2017-06-163-24/+50
* | | | | Merge pull request #1265 from rabbitmq/rabbitmq-server-1264Michael Klishin2017-06-192-0/+20
|\ \ \ \ \
| * | | | | add memory_monitor_interval testLuke Bakken2017-06-192-0/+20
|/ / / / /
* | | | | Revert "Revert "Using square brackets could cause an error""Michael Klishin2017-06-171-0/+25
* | | | | Merge branch 'stable'Michael Klishin2017-06-171-25/+0
|\ \ \ \ \ | |/ / / /
| * | | | Manually re-apply #1269Michael Klishin2017-06-171-1/+1
| * | | | Revert "Using square brackets could cause an error"Michael Klishin2017-06-171-26/+1
| | |_|/ | |/| |
* | | | Merge pull request #1232 from rabbitmq/rabbitmq-server-1229Michael Klishin2017-06-172-0/+126
|\ \ \ \
| * \ \ \ Merge branch 'master' into rabbitmq-server-1229Michael Klishin2017-06-175-8/+7
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'stable'Michael Klishin2017-06-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Using square brackets could cause an errorLuke Bakken2017-06-171-1/+26
| | |/ / | |/| |
* | | | Merge pull request #1269 from rabbitmq/fix-windows-empty-stringMichael Klishin2017-06-171-2/+1
|\ \ \ \
| * | | | Using square brackets could cause an errorLuke Bakken2017-06-161-2/+1
|/ / / /
* | | | Merge pull request #1267 from rabbitmq/rename-schema-fileDaniil Fedotov2017-06-164-6/+6
|\ \ \ \
| * | | | Rename rabbitmq.schema to rabbit.schema so that the name matches the applicat...Luke Bakken2017-06-154-6/+6
|/ / / /
| | * | Merge branch 'master' into rabbitmq-server-1229Michael Klishin2017-06-151-1/+1
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1266 from rabbitmq/cluster_formationMichael Klishin2017-06-151-1/+1
|\ \ \ \
| * | | | Depend on inets to ensure it is started when peer discovery beginsDiana Corbacho2017-06-151-1/+1
| | | * | Merge branch 'rabbitmq-server-1229' of github.com:rabbitmq/rabbitmq-server in...Arnaud Cogoluègnes2017-06-140-0/+0
| | | |\ \
| | | | * \ Merge branch 'master' into rabbitmq-server-1229Michael Klishin2017-06-1321-62/+372
| | | | |\ \ | | |_|_|/ / | |/| | | |
| | | * | | Change wording for topic authz variable expansionArnaud Cogoluègnes2017-06-141-2/+3
| | | * | | Merge branch 'master' into rabbitmq-server-1229Arnaud Cogoluègnes2017-06-1423-83/+431
| | | |\ \ \ | |_|_|/ / / |/| | | / / | | | |/ /
* | | | | Do not assume `#resource` is a 4-element tuple.Daniil Fedotov2017-06-131-1/+1
* | | | | Merge branch 'stable'Jean-Sébastien Pédron2017-06-133-21/+59
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #1260 from rabbitmq/improve-partitions_SUITED Corbacho2017-06-132-20/+58
| |\ \ \