summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Switch to rabbit_json:try_decode/1Michael Klishin2017-02-013-4/+4
| * | | | merge branch 'master'Michael Klishin2017-02-012-2/+2
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Add Reason to error handlerGabriele Santomaggio2017-01-271-2/+3
| * | | | Add Reason to error handlerGabriele Santomaggio2017-01-272-4/+9
| * | | | Change the calls that uses the rabbit_json moduleGabriele Santomaggio2017-01-253-4/+4
| |/ / /
| | | * Merge branch 'master' into rabbitmq-server-1085Arnaud Cogoluègnes2017-01-312-2/+2
| | | |\ | |_|_|/ |/| | |
* | | | merge branch 'stable'Michael Klishin2017-01-311-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Update rabbitmq-components.mkrabbitmq_v3_6_7_milestone5Michael Klishin2017-01-311-1/+1
* | | | Merge branch 'stable'Jean-Sébastien Pédron2017-01-311-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Makefile: Load rabbitmq-dist.mk before rabbitmq-run.mkJean-Sébastien Pédron2017-01-311-1/+1
| | * Merge branch 'master' into rabbitmq-server-1085Arnaud Cogoluègnes2017-01-2318-205/+322
| | |\ | |_|/ |/| |
* | | Merge pull request #1082 from rabbitmq/rabbitmq-event-exchange-10rabbitmq_v3_7_0_milestone10Michael Klishin2017-01-2118-205/+323
|\ \ \
| * \ \ Merge branch 'master' into rabbitmq-event-exchange-10Michael Klishin2017-01-204-12/+100
| |\ \ \ | |/ / / |/| | |
| * | | Fall back to ?UNKNOWN_USER if no user is present in optionsMichael Klishin2017-01-202-2/+2
| * | | Merge branch 'master' into rabbitmq-event-exchange-10Michael Klishin2017-01-171-7/+8
| |\ \ \