summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '680d09' into baserock/ps/proto-web-systembaserock/ps/proto-web-systemPaul Sherwood2014-04-20167-837/+3780
|\
| * merge revision(s) 45271: [Backport #9672]usa2014-03-313-6/+13
| * merge revision(s) 44878,44879: [Backport #9483]usa2014-02-244-6/+22
| * merge revision(s) 44584,44587,44945: [Backport #9243]usa2014-02-243-3/+6
| * merge revision(s) 44585: [Backport #9268]usa2014-02-244-6/+13
| * merge revision(s) 45130: [Backport #9554]usa2014-02-223-2/+7
| * * test/socket/test_unix.rb: 1.9.3 doesn't have IO::EAGAINWaitReadable.usa2014-02-222-2/+2
| * merge revision(s) 45066: [Backport #9550]usa2014-02-224-11/+38
| * merge revision(s) 45084: [Backport #9547]usa2014-02-223-3/+18
| * merge revision(s) 45076: [Backport #9535]usa2014-02-227-5/+28
| * merge revision(s) 34605: [Backport #9351]usa2014-02-182-4/+4
| * * ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto atusa2014-02-183-4/+10
| * merge revision(s) 43148,43149,43152: [Backport #8433]usa2014-02-174-9/+61
| * * ext/socket: revert r44943 because it causes errors on some linuxusa2014-02-146-21/+10
| * * configure.in (ARCH_FLAG): __sync_val_compare_and_swap_4 needsusa2014-02-143-1/+29
| * merge revision(s) 43851,43882,43996:usa2014-02-144-6/+67
| * * ruby_atomic.h (ATOMIC_CAS): added.usa2014-02-144-1/+35
| * merge revision(s) 44880: [Backport #9477]usa2014-02-143-5/+19
| * merge revision(s) 44884: [Backport #9498]usa2014-02-143-1/+10
| * merge revision(s) 44514: [Backport #9374]usa2014-02-144-1/+9
| * merge revision(s) 44568: [Backport #9399]usa2014-02-144-2/+25
| * merge revision(s) 44642: [Backport #9093]usa2014-02-143-3/+9
| * merge revision(s) 44643: [Backport #9039]usa2014-02-146-5/+26
| * merge revision(s) 44772,44773: [Backport #9430]usa2014-02-143-2/+7
| * merge revision(s) 44731,44751: [Backport #8978]usa2014-02-143-3/+16
| * merge revision(s) 44670,44671,44675: [Backport #8783]usa2014-02-143-10/+22
| * merge revision(s) 44628: [Backport #9413]usa2014-02-144-3/+21
| * merge revision(s) 43942,43957,43975: [Backport #9187]usa2014-02-145-1/+82
| * merge revision(s) 42844,42845: [Backport #8865]usa2014-02-144-10/+241
| * merge revision(s) 40848: [Backport #8425]usa2014-02-144-5/+20
| * merge revision(s) 41215,41216,41217: [Backport #8627]usa2014-02-143-3/+25
| * * lib/thread.rb (SizedQueue#clear): wake waiting threads when called.usa2014-02-144-3/+50
| * * configure.in (POSTLINK): sign built program using RUBY_CODESIGNusa2014-02-067-5/+33
| * merge revision(s) 44803: [Backport #9485]usa2014-02-054-1/+9
| * merge revision(s) 44790: [Backport #9472]usa2014-02-053-1/+7
| * merge revision(s) 37905: [Backport #8757]usa2014-02-053-5/+9
| * fixed merge mistake at r44766.usa2014-01-312-4/+5
| * merge revision(s) 44184: [Backport #9247]usa2014-01-306-33/+145
| * merge revision(s) 40534,41886,41903,41910: [Backport #8616]usa2014-01-304-17/+37
| * * ruby_atomic.h (ATOMIC_PTR_EXCHANGE): fixed previous commit.usa2014-01-302-2/+2
| * merge revision(s) 43994,44000: [Backport #9205]usa2014-01-305-4/+30
| * merge revision(s) 33361,33460: [Backport #9463]usa2014-01-303-4/+24
| * 1.9.3 does not have rb_exc_new_str(). use rb_exc_new3() instead of it.usa2014-01-305-6/+6
| * merge revision(s) 44570:44572,44581:usa2014-01-3019-141/+164
| * * enumerator.c: include internal.h instead of declaring the externalusa2014-01-294-4/+9
| * * enumerator.c (enumerator_with_index_i): add the declaration ofusa2014-01-293-1/+8
| * merge revision(s) 44086,44126: [Backport #9221]usa2014-01-294-5/+18
| * merge revision(s) 39722,43929: [Backport #9178]usa2014-01-296-6/+42
| * merge revision(s) 39594,39596: [Backport #8010]usa2014-01-296-10/+30
| * merge revision(s) 43398,43407,43408,43417: [Backport #9044]usa2014-01-294-2/+41