summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-03 04:39:50 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-03 04:39:50 +0000
commit47264c4e1ffbc34fdd83b8bada241990433d9ee3 (patch)
tree142f528e554bc695fbe0f9f432c7ee8e7811abee /version.h
parent0187f76a676cb545106e6d5d6fdb8f2d060261a4 (diff)
merge revision(s) 46151,46165: [Backport #9865]
* io.c (rb_io_fileno, rb_io_inspect): non-modification does not error on frozen IO. [ruby-dev:48241] [Bug #9865] * io.c (rb_io_autoclose_p): Don't raise on frozen IO. * test/lib/minitest/unit.rb: IO#autoclose? may raise IOError. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47368 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 f138795a86..2d10400787 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-09-03"
-#define RUBY_PATCHLEVEL 546
+#define RUBY_PATCHLEVEL 547
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9