hg: jdk/sandbox: 2 new changesets

[ashipile at redhat.com]

Changeset: d7b4990d04d6
Author:    shade
Date:      2017-11-30 18:43 +0100
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/d7b4990d04d6

Remove stray post-merge difference.

! src/hotspot/share/gc/shared/barrierSet.hpp

Changeset: c5c3e1a5c3f0
Author:    shade
Date:      2017-11-30 18:51 +0100
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/c5c3e1a5c3f0

Rename EpsilonCollectedHeap to EpsilonHeap.

! src/hotspot/share/gc/epsilon/epsilonArguments.cpp
- src/hotspot/share/gc/epsilon/epsilonCollectedHeap.cpp
- src/hotspot/share/gc/epsilon/epsilonCollectedHeap.hpp
+ src/hotspot/share/gc/epsilon/epsilonHeap.cpp
+ src/hotspot/share/gc/epsilon/epsilonHeap.hpp
! src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp
! src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
! src/hotspot/share/gc/shared/collectedHeap.hpp
! src/hotspot/share/services/epsilonMemoryPool.cpp
! src/hotspot/share/services/epsilonMemoryPool.hpp
! src/hotspot/share/services/memoryService.cpp
! src/hotspot/share/services/memoryService.hpp