changeset 12909:23b8db5ea31d hs25-b55

Merge
author amurillo
date Fri, 18 Oct 2013 21:30:42 -0700
parents aeae561a6d0b (diff) c51cd6af7e61 (current diff)
children e8cbdc701bfb
files src/share/vm/memory/metablock.cpp src/share/vm/memory/metablock.hpp test/compiler/8013496/Test8013496.sh test/gc/7168848/HumongousAlloc.java
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Oct 18 12:10:44 2013 -0700
+++ b/.hgtags	Fri Oct 18 21:30:42 2013 -0700
@@ -385,3 +385,4 @@
 562a3d356de67670b4172b82aca2d30743449e04 hs25-b53
 f6962730bbde82f279a0ae3a1c14bc5e58096c6e jdk8-b111
 4a845c7a463844cead9e1e1641d6bcfb8a77f1c7 hs25-b54
+0ed9a90f45e1b392c671005f9ee22ce1acf02984 jdk8-b112