summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-13 08:02:39 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-13 08:02:39 +0000
commit99fdb0a71b54fbea4ded06b99cb8c003c1d9552e (patch)
tree8e08866a5551b9f80372b3ca888f9b259494af45 /version.h
parent4f0e238f2854a9f3e5a1f3cbb0c8d32e66dc15d8 (diff)
merge revision(s) 49452: [Backport #10813]
* thread_pthread.c (reserve_stack): fix intermittent SIGBUS on Linux, by reserving the stack virtual address space at process start up so that it will not clash with the heap space. [Fix GH-822] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50289 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 8092f0d733..dbf58ed46d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2015-04-13"
-#define RUBY_PATCHLEVEL 332
+#define RUBY_PATCHLEVEL 333
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 4