summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable'Michael Klishin2017-02-111-50/+83
|\
| * Merge pull request #1107 from rabbitmq/rabbitmq-management-345rabbitmq_v3_6_7_rc1Michael Klishin2017-02-111-50/+83
| |\
| | * Merge branch 'stable' into rabbitmq-management-345Michael Klishin2017-02-1015-289/+598
| | |\ | | |/ | |/|
| | * Calculate memory size of pagged messagesDiana Corbacho2017-02-101-50/+83
* | | Merge branch 'stable'Daniil Fedotov2017-02-101-12/+16
|\ \ \ | |/ /
| * | Make dynamic_ha tests more tolerant to timing issuesDaniil Fedotov2017-02-101-12/+16
* | | Update rabbitmq-components.mkMichael Klishin2017-02-101-1/+1
* | | Merge pull request #1095 from rabbitmq/rabbitmq-server-589Michael Klishin2017-02-103-1/+104
|\ \ \
| * | | Update rabbitmq-components.mkMichael Klishin2017-02-101-0/+3
| * | | Remove ranch proxy protocol from rabbitmq-componentsArnaud Cogoluègnes2017-02-071-1/+0
| * | | Add ranch proxy protocol to rabbitmq-componentsArnaud Cogoluègnes2017-02-071-0/+1
| * | | Fix MakefileArnaud Cogoluègnes2017-02-071-1/+1
| * | | Merge branch 'master' into rabbitmq-server-589Arnaud Cogoluègnes2017-02-0711-256/+63
| |\ \ \
| * | | | Add tests for proxy protocol supportArnaud Cogoluègnes2017-02-071-0/+100
| * | | | Add proxy_protocol configuration optionsArnaud Cogoluègnes2017-02-021-1/+3
* | | | | Merge pull request #1106 from rabbitmq/rabbitmq-auth-backend-cache-7Michael Klishin2017-02-091-2/+44
|\ \ \ \ \
| * | | | | Remove a duplicate headMichael Klishin2017-02-091-1/+0
| * | | | | Merge branch 'master' into rabbitmq-auth-backend-cache-7Michael Klishin2017-02-095-900/+58
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Accept `cache` as a shortcut for `rabbit_auth_backend_cache`Michael Klishin2017-02-092-1/+12
* | | | | | Merge pull request #1103 from rabbitmq/rabbitmq-auth-backend-ldap-59Michael Klishin2017-02-094-901/+46
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into rabbitmq-auth-backend-ldap-59Michael Klishin2017-02-092-8/+8
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Rename auth backends prefixes to auth_XDaniil Fedotov2017-02-094-901/+46
| * | | | | | Shorter prefix for LDAP conf keys in test snippetsDaniil Fedotov2017-02-081-13/+13
| | * | | | | Support auth backend cache in sysctl configDaniil Fedotov2017-02-092-3/+44
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1105 from Jakauppila/rabbitmq-server-1104Michael Klishin2017-02-092-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Quote -conf_dir/-conf_schema_dir path variablesJakauppila2017-02-082-8/+8
|/ / / / /
* | | | | merge branch 'stable'Michael Klishin2017-02-081-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Update rabbitmq-components.mkMichael Klishin2017-02-081-0/+2
* | | | | Use more realistic hostnames in ldap.servers examplesMichael Klishin2017-02-081-4/+10
* | | | | Merge branch 'stable'Michael Klishin2017-02-082-16/+10
|\ \ \ \ \ | |/ / / /
| * | | | Rework credit_flow test to not depend on application envMichael Klishin2017-02-081-14/+8
| * | | | Mention #1098Michael Klishin2017-02-081-2/+2
* | | | | Merge branch 'stable'rabbitmq_v3_7_0_milestone11Michael Klishin2017-02-071-4/+4
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Update test expectationsrabbitmq_v3_6_7_milestone6Michael Klishin2017-02-071-4/+4
* | | | Merge branch 'stable'Jean-Sébastien Pédron2017-02-071-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'disable-background-gc-by-default' into stableJean-Sébastien Pédron2017-02-071-3/+3
| |\ \ \
| | * | | Bump message store credit flow settingsMichael Klishin2017-02-051-1/+1
| | * | | Disable background GC by default; bump credit flow defaultsMichael Klishin2017-02-051-2/+2
* | | | | merge branch 'stable'Michael Klishin2017-02-061-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Update rabbitmq-components.mkMichael Klishin2017-02-061-0/+2
| |/ / /
* | | | Merge pull request #1086 from rabbitmq/rabbitmq-server-1085Michael Klishin2017-02-063-25/+25
|\ \ \ \
| * \ \ \ Merge branch 'master' into rabbitmq-server-1085Michael Klishin2017-02-057-227/+32
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'stable'Michael Klishin2017-02-031-219/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1097 from rabbitmq/move-rabbit_ssl-functions-to-rabbitmq-...Michael Klishin2017-02-031-219/+9
| |\ \ \ \
| | * | | | rabbit_ssl: Move most functions to `rabbit_cert_info` in rabbitmq-commonJean-Sébastien Pédron2017-02-031-219/+9
| |/ / / /
* | | | | Update rabbitmq-components.mkJean-Sébastien Pédron2017-02-021-1/+1
* | | | | Merge pull request #1091 from rabbitmq/rabbitmq-server-1090Gerhard Lazu2017-02-022-1/+10
|\ \ \ \ \
| * | | | | Rename "alpha" to "preview" in version commentDaniil Fedotov2017-01-261-4/+4
| * | | | | Ignore pre-release version part in plugin version requirement validationDaniil Fedotov2017-01-262-1/+10
* | | | | | Merge pull request #1089 from rabbitmq/rabbitmq-common-164Michael Klishin2017-02-013-6/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |