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

[marcus.larsson at oracle.com]

Changeset: f99ad7bb5df5
Author:    mlarsson
Date:      2015-09-24 12:36 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/f99ad7bb5df5

8046148: JEP 158: Unified JVM Logging
Reviewed-by: coleenp, sla

! make/windows/makefiles/vm.make
! src/share/vm/Xusage.txt
+ src/share/vm/logging/log.hpp
+ src/share/vm/logging/logConfiguration.cpp
+ src/share/vm/logging/logConfiguration.hpp
+ src/share/vm/logging/logDecorations.cpp
+ src/share/vm/logging/logDecorations.hpp
+ src/share/vm/logging/logDecorators.cpp
+ src/share/vm/logging/logDecorators.hpp
+ src/share/vm/logging/logDiagnosticCommand.cpp
+ src/share/vm/logging/logDiagnosticCommand.hpp
+ src/share/vm/logging/logFileOutput.cpp
+ src/share/vm/logging/logFileOutput.hpp
+ src/share/vm/logging/logFileStreamOutput.cpp
+ src/share/vm/logging/logFileStreamOutput.hpp
+ src/share/vm/logging/logLevel.cpp
+ src/share/vm/logging/logLevel.hpp
+ src/share/vm/logging/logOutput.cpp
+ src/share/vm/logging/logOutput.hpp
+ src/share/vm/logging/logOutputList.cpp
+ src/share/vm/logging/logOutputList.hpp
+ src/share/vm/logging/logPrefix.hpp
+ src/share/vm/logging/logTag.cpp
+ src/share/vm/logging/logTag.hpp
+ src/share/vm/logging/logTagLevelExpression.cpp
+ src/share/vm/logging/logTagLevelExpression.hpp
+ src/share/vm/logging/logTagSet.cpp
+ src/share/vm/logging/logTagSet.hpp
! src/share/vm/memory/allocation.hpp
! src/share/vm/precompiled/precompiled.hpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/mutexLocker.cpp
! src/share/vm/runtime/mutexLocker.hpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/services/management.hpp
! src/share/vm/services/nmtCommon.cpp
! src/share/vm/utilities/ostream.cpp
! src/share/vm/utilities/ostream.hpp
+ test/serviceability/logging/TestBasicLogOutput.java

Changeset: 1f6500dbefcb
Author:    mlarsson
Date:      2015-09-24 16:19 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/1f6500dbefcb

Merge