hg: jdk9/hs-rt/hotspot: 2 new changesets

[coleen.phillimore at oracle.com]

Changeset: 345325f153d4
Author:    shade
Date:      2014-11-11 15:07 +0300
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/345325f153d4

8015272: Make @Contended within the same group to use the same oop map
Reviewed-by: coleenp, dholmes

! src/share/vm/classfile/classFileParser.cpp
+ test/runtime/contended/OopMapsSameGroup.java

Changeset: 7b66181a98c8
Author:    coleenp
Date:      2014-11-11 18:00 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/7b66181a98c8

Merge