lp:~brodock/ruby-daily/stable

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

29621. By svn <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-04-22

* 2016-04-22

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29620. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-04-22

Revert previous commit because it was a mistake.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29619. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-04-22

merge revision(s) 54307: [Backport #12193]

 * lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
   https://github.com/rubygems/rubygems/pull/1554
   [Bug #12193][ruby-core:74431]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29618. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-31

* test/rubygems/test_gem_commands_environment_command.rb (test_execute):
  version number may be two-digit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29617. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-31

* version.h: commit miss

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29616. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-31

* version.h: bump to 2.1.10. welcome to two-digit version!

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29615. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-30

merge revision(s) 53227: [Backport #11852]

 * test/ruby/test_io.rb: handled rlimit value same as r52277
   [Bug #11852][ruby-dev:49446]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29614. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-29

merge revision(s) 54258: [Backport #12182]

 * ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
   function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
   even if it is disabled by OpenSSL configuration.
   [ruby-core:74384] [Bug #12182]

 * ext/openssl/ossl_ssl.c: update #ifdef(s) as above.

 * test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29613. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-29

merge revision(s) 54257: [Backport #12215]

 * lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
   missing mandatory arguments. [ruby-core:74540] [Bug #12215]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

29612. By usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> on 2016-03-29

merge revision(s) 54256: [Backport #12118] [Backport #12218]

 * thread_pthread.c (reserve_stack): fix reserving position where
   the stack growing bottom to top. [Bug #12118]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e