Code

Merge upstream Ruby 2.1.4#21

Code

Merged

dbussink merged 27 commits into2.1github/ruby:2.1from

dbussink-ruby-2-1-4github/ruby:dbussink-ruby-2-1-4Copy head branch name to clipboard

Nov 11, 2014

Commits

Commits on Sep 23, 2014

• * version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.4.

  Show description for 7693578
  nagachika

  committed
  7693578

  Copy full SHA for 7693578

• merge revision(s) r47111,r47212,r47451,r47452,r47680: [Backport #10245]

  Show description for 77ce45d
  nagachika

  committed
  77ce45d

  Copy full SHA for 77ce45d

• merge revision(s) r47683: [Backport #10281]

  Show description for c8ec78c
  nagachika

  committed
  c8ec78c

  Copy full SHA for c8ec78c

• merge revision(s) r47641,r47642,r47644: [Backport #10262]

  Show description for ee69bb4
  nagachika

  committed
  ee69bb4

  Copy full SHA for ee69bb4

• merge revision(s) r47696,r47697: [Backport #10279]

  Show description for 2ccf728
  nagachika

  committed
  2ccf728

  Copy full SHA for 2ccf728

Commits on Oct 15, 2014

• merge revision(s) r47820: [Backport #10330]

  Show description for 309b930
  nagachika

  committed
  309b930

  Copy full SHA for 309b930

• merge revision(s) r47819: [Backport #9914]

  Show description for 9ecfc87
  nagachika

  committed
  9ecfc87

  Copy full SHA for 9ecfc87

• merge revision(s) r47850: [Backport #10294]

  Show description for b1c5f7e
  nagachika

  committed
  b1c5f7e

  Copy full SHA for b1c5f7e

• merge revision(s) r47891: [Backport #10373]

  Show description for 22a193f
  nagachika

  committed
  22a193f

  Copy full SHA for 22a193f

• merge revision(s) r47896: [Backport #10369]

  Show description for a50794d
  nagachika

  committed
  a50794d

  Copy full SHA for a50794d

• merge revision(s) r45715: [Backport #10265]

  Show description for 39fcf33
  nagachika

  committed
  39fcf33

  Copy full SHA for 39fcf33

• merge revision(s) r46783: [Backport #6716]

  Show description for b3cfa2f
  nagachika

  committed
  b3cfa2f

  Copy full SHA for b3cfa2f

• merge r47598 partially. extracted commits are as follows. [Bug #9728]

  Show description for 8bdf68d
  nagachika

  committed
  8bdf68d

  Copy full SHA for 8bdf68d

• * 2014-10-16

  Show description for 69fe55a
  matzbot

  committed
  69fe55a

  Copy full SHA for 69fe55a

• merge revision(s) r47818,r47832: [Backport #9820]

  Show description for 982aab0
  nagachika

  committed
  982aab0

  Copy full SHA for 982aab0

• merge revision(s) r47715: [Backport #10282]

  Show description for d396f66
  nagachika

  committed
  d396f66

  Copy full SHA for d396f66

• merge revision(s) r47900: [Backport #10035]

  Show description for 90c3ddc
  nagachika

  committed
  90c3ddc

  Copy full SHA for 90c3ddc

Commits on Oct 16, 2014

• merge revision(s) r47645: [Backport #10263]

  Show description for dac945b
  nagachika

  committed
  dac945b

  Copy full SHA for dac945b

• merge revision(s) r47716: [Backport #10285]

  Show description for 2d17e3a
  nagachika

  committed
  2d17e3a

  Copy full SHA for 2d17e3a

Commits on Oct 18, 2014

• merge revision(s) r47973: [Backport #10392]

  Show description for 3ec2fe7
  nagachika

  committed
  3ec2fe7

  Copy full SHA for 3ec2fe7

• merge revision(s) r48000: [Backport #10368]

  Show description for 06ce3b7
  nagachika

  committed
  06ce3b7

  Copy full SHA for 06ce3b7

Commits on Oct 22, 2014

• merge revision(s) r45274,r45278,r45280,r48097: [Backport #9424] [Backport #9640]

  Show description for 5a58165
  nagachika

  committed
  5a58165

  Copy full SHA for 5a58165

Commits on Oct 25, 2014

• merge revision(s) r48102: [Backport #10413]

  Show description for a7a045f
  nagachika

  committed
  a7a045f

  Copy full SHA for a7a045f

• merge revision(s) r48111,r48118,r48120: [Backport #10421]

  Show description for d841eef
  nagachika

  committed
  d841eef

  Copy full SHA for d841eef

Commits on Oct 27, 2014

• merge revision(s) r48161:

  Show description for 31d25ce
  nagachika

  committed
  31d25ce

  Copy full SHA for 31d25ce

• add tag v2_1_4

  Show description for e966a41
  nagachika

  committed
  e966a41

  Copy full SHA for e966a41

Commits on Nov 11, 2014

• Merge tag 'v2_1_4' into dbussink-ruby-2-1-4

  Show description for 25de41c
  dbussink

  committed
  25de41c

  Copy full SHA for 25de41c