summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-15 14:23:13 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-15 14:23:13 +0000
commit155b12e673516db1d499af7789a235846eb24a27 (patch)
treee2faf5f6b610d90f7c9622fca932ac3603eafdd7 /version.h
parente54ec54d2d9303e9a43b90aef8e009758d51b061 (diff)
merge revision(s) r46495,r46499: [Backport #9971]
signal.c: no cfunc frame at stack overflow * signal.c (check_stack_overflow): avoid pushing a cfunc frame, trying to fix stack overflow deadlock. * signal.c (check_stack_overflow): drop the last tag too close to the fault page, to get rid of stack overflow deadlock. [Bug #9971] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47597 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 9c7b05d8a0..3a72a30b2f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-09-15"
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9