summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-04 17:19:20 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-04 17:19:20 +0000
commit647b55f64ade31427601fe0eb1d049484d656977 (patch)
treef36404c6e18946317ec1dc85fcaacf54561d3277 /version.h
parentcd705d115a8d118cb6b6ab9e0b1c79573973280b (diff)
merge revision(s) r45298,r45311: [Backport #9518]
test/ruby/envutil.rb: compare RSS to check memory leak * test/ruby/envutil.rb (Test::Test#assert_no_memory_leak): compare also RSS if available. * test/ruby/memory_status.rb (Memory::Status.parse): read string form of an instance. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index f6c311b4f2..43ad9c2507 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-05-05"
-#define RUBY_PATCHLEVEL 89
+#define RUBY_PATCHLEVEL 90
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5