naruse	2014-01-15 11:30:50 +0900 (Wed, 15 Jan 2014)

  New Revision: 44603

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44603

  Log:
    merge revision(s) 44601:
    
    FreeBSD 10 SEGVs this less than 4M + 12K bytes.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/bootstraptest/test_method.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/bootstraptest/test_method.rb
===================================================================
--- ruby_2_1/bootstraptest/test_method.rb	(revision 44602)
+++ ruby_2_1/bootstraptest/test_method.rb	(revision 44603)
@@ -957,8 +957,8 @@ assert_equal 'ok', %q{ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/bootstraptest/test_method.rb#L957
 
 assert_normal_exit %q{
   begin
-    Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
-    # FreeBSD fails this less than 4M + 8K bytes.
+    Process.setrlimit(Process::RLIMIT_STACK, 4_206_592)
+    # FreeBSD SEGVs this less than 4M + 12K bytes.
   rescue Exception
     exit
   end
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44602)
+++ ruby_2_1/version.h	(revision 44603)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-01-15"
-#define RUBY_PATCHLEVEL 6
+#define RUBY_PATCHLEVEL 7
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44601


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/