naruse	2012-02-09 03:30:35 +0900 (Thu, 09 Feb 2012)

  New Revision: 34498

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

  Log:
    merge revision(s) 34497:
    ------------------------------------------------------------------------
    r34497 | naruse | 2012-02-09 03:29:52 +0900 (Thu, 09 Feb 2012) | 1 line
    
    FreeBSD needs multiple -o.
    ------------------------------------------------------------------------

  Modified files:
    branches/ruby_1_9_3/test/ruby/memory_status.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34497)
+++ ruby_1_9_3/version.h	(revision 34498)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 68
+#define RUBY_PATCHLEVEL 69
 
-#define RUBY_RELEASE_DATE "2012-02-08"
+#define RUBY_RELEASE_DATE "2012-02-09"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"
 
Index: ruby_1_9_3/test/ruby/memory_status.rb
===================================================================
--- ruby_1_9_3/test/ruby/memory_status.rb	(revision 34497)
+++ ruby_1_9_3/test/ruby/memory_status.rb	(revision 34498)
@@ -59,7 +59,7 @@
       end
     end
   else
-    PSCMD = ["ps", "-o", "vsz=,rss=", "-p"]
+    PSCMD = ["ps", "-ovsz=","-orss=", "-p"]
     PAT = /^\s*(\d+)\s+(\d+)$/
 
     keys << :size << :rss

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