hg: jdk7/hotspot/hotspot: 2 new changesets

[jon.masamitsu at sun.com]

Changeset: 830ca2573896
Author:    tonyp
Date:      2009-06-12 16:20 -0400
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/830ca2573896

6850846: G1: extend G1 marking verification
Summary: extend G1 marking verification to use either the "prev" or "next" marking information, as appropriate.
Reviewed-by: johnc, ysr

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/gc_implementation/g1/heapRegion.cpp
! src/share/vm/gc_implementation/g1/heapRegion.hpp

Changeset: 85d0690f7d12
Author:    jmasa
Date:      2009-06-19 07:33 -0700
URL:       http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/85d0690f7d12

Merge