summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-30 12:35:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-30 12:35:49 +0000
commit687763bc4f7cc7acb57b3ebb4641eeeec0648c22 (patch)
treee8ae1ef88a93e4ca8f21401b00d18645d6ca7bf3 /version.h
parent896d9fb9957f3c2d0a739e156f0775faa326d13c (diff)
merge revision(s) 56558,59116,59136: [Backport #12670]
* gc.c (heap_page_resurrect): do not return tomb_pages when page->freelist == NULL. [Bug #12670] test for [Bug #12670] heap corruption by deferred free. gc.c: expand sorted pages * gc.c (heap_page_allocate): expand sorted pages before inserting allocated new page. [Bug #12670] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59234 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 0005fdf3bc..beca3fa556 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 330
+#define RUBY_PATCHLEVEL 331
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 6