summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge stable into masterMichael Klishin2015-08-279-22/+196
* rabbitmq-script-wrapper: Use '=', not '==' with Bourne shell's testJean-Sébastien Pédron2015-08-241-1/+1
* Merge branch 'stable'Michael Klishin2015-08-191-1/+6
|\
| * Merge pull request #277 from nishan/stableMichael Klishin2015-08-191-1/+6
| |\
| | * On Linux, use -r option for 'sed'. -E is not present in versions earlier vers...Nishan Naseer2015-08-191-1/+6
| |/
* | Merge branch 'stable'Alvaro Videla2015-08-181-2/+9
|\ \ | |/
| * Merge pull request #269 from erylee/stableAlvaro Videla2015-08-181-2/+9
| |\
| | * issue #268 - gen_server2 can fail to dispatch messages sent by a process to i...Feng Lee2015-08-161-2/+9
| |/
* | Merge branch 'stable'Jean-Sébastien Pédron2015-08-131-1/+17
|\ \ | |/
| * Fix versions comparison to work on Mac OS X tooJean-Sébastien Pédron2015-08-131-1/+17
* | Merge branch 'stable'Jean-Sébastien Pédron2015-08-131-7/+9
|\ \ | |/
| * Makefile: Resolve $(USE_PROPER_QC) only when neededJean-Sébastien Pédron2015-08-131-1/+1
| * Makefile: Use `erl -version` to do ERTS version testsJean-Sébastien Pédron2015-08-131-6/+8
* | Merge branch 'stable'Jean-Sébastien Pédron2015-08-120-0/+0
|\ \ | |/
| * Add `ssl_compat` and `time_compat`Jean-Sébastien Pédron2015-08-122-0/+380
* | Merge branch 'rabbitmq-server-233'Jean-Sébastien Pédron2015-08-113-2/+8
|\ \
| * | erlang:phash2/1 returns a value in the range 0..Range-1Jean-Sébastien Pédron2015-08-111-1/+1
| * | Avoid division by 0Jean-Sébastien Pédron2015-08-112-1/+7
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-08-112-5/+7
|\ \ \ | | |/ | |/|
| * | Merge branch 'rabbitmq-server-234' into stableJean-Sébastien Pédron2015-08-111-4/+2
| |\ \
| | * | rabbitmq-server: Don't catch EXIT "signal"Jean-Sébastien Pédron2015-08-111-4/+2
| * | | make stop-node: Stop the node synchronouslyJean-Sébastien Pédron2015-08-111-1/+5
* | | | Merge branch 'stable'Jean-Sébastien Pédron2015-08-101-28/+68
|\ \ \ \ | |/ / /
| * | | Merge pull request #258 from rabbitmq/rabbitmq-server-234Jean-Sébastien Pédron2015-08-101-28/+68
| |\ \ \ | | |/ /
| | * | rabbitmq-server: Catch SIG{HUP,INT,TERM,TSTP} and exit gracefullyJean-Sébastien Pédron2015-08-101-28/+68
| |/ /
* | | Merge pull request #254 from rabbitmq/rabbitmq-server-233Michael Klishin2015-08-0925-112/+440
|\ \ \ | | |/ | |/|
| * | rabbit_misc: Remove now_ms/0 and now_to_ms/1Jean-Sébastien Pédron2015-08-051-12/+0
| * | Replace os:timestamp() with os:system_time(milli_seconds)Jean-Sébastien Pédron2015-08-054-8/+17
| * | GM: Convert the testsuite to use `time_compat`Jean-Sébastien Pédron2015-08-052-8/+13
| * | rabbit_node_monitor: Rework `global` hang workaroundJean-Sébastien Pédron2015-08-051-11/+15
| * | pg2_fixed: Use erlang:system_time(micro_seconds) to pick a "random" nodeJean-Sébastien Pédron2015-08-051-2/+2
| * | Use os:system_time() when the time is exposedJean-Sébastien Pédron2015-08-054-8/+8
| * | Use os:timestamp() to get a non-unique timestampJean-Sébastien Pédron2015-08-052-2/+2
| * | Use monotonic_time() to compute elapsed timeJean-Sébastien Pédron2015-08-0510-55/+66
| * | Use phash2() and the new Time API as a random seedJean-Sébastien Pédron2015-08-055-8/+14
| * | Add `time_compat` moduleJean-Sébastien Pédron2015-08-051-0/+305
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-08-073-7/+10
|\ \ \ | | |/ | |/|
| * | Warn about exported variablesJean-Sébastien Pédron2015-08-073-7/+10
* | | Merge pull request #256 from rabbitmq/rabbitmq-server-245Michael Klishin2015-08-061-0/+16
|\ \ \ | |_|/ |/| |
| * | Priority queue: Fix a crash when querying 'head_message_timestamp'Jean-Sébastien Pédron2015-08-061-0/+16
|/ /
* | Merge branch 'rabbitmq-server-250'Jean-Sébastien Pédron2015-08-052-4/+4
|\ \
| * | RPM/deb: Depend on Erlang R16B03Jean-Sébastien Pédron2015-08-052-4/+4
* | | Merge branch 'stable'Jean-Sébastien Pédron2015-08-051-0/+9
|\ \ \ | | |/ | |/|
| * | Merge pull request #253 from rabbitmq/rabbitmq-server-251Jean-Sébastien Pédron2015-08-051-0/+9
| |\ \
| | * | Memory monitor: Log a warning if a 32-bit version of Erlang is usedJean-Sébastien Pédron2015-08-051-0/+9
| |/ /
* | | Merge branch 'rabbitmq-server-250'Jean-Sébastien Pédron2015-08-041-1/+1
|\ \ \ | | |/ | |/|
| * | Require Erlang R16B03, not R16B03-1Jean-Sébastien Pédron2015-08-041-1/+1
* | | Merge pull request #252 from rabbitmq/rabbitmq-server-250Jean-Sébastien Pédron2015-08-042-8/+21
|\ \ \ | |/ /
| * | Require Erlang R16B03-1Jean-Sébastien Pédron2015-08-042-8/+21
|/ /
* | Merge branch 'rabbitmq-server-121'Michael Klishin2015-08-049-3/+384
|\ \