hg: jdk9/hs/hotspot: 2 new changesets

[coleen.phillimore at oracle.com]

Changeset: d142a959d2ae
Author:    goetz
Date:      2016-04-22 14:57 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/d142a959d2ae

8154921: Fix aix after "8146879: Add option for handling existing log files in UL"
Summary: Rename os::fileno to os::get_fileno because AIX defines macro 'fileno'.
Reviewed-by: coleenp

! src/os/posix/vm/os_posix.cpp
! src/os/windows/vm/os_windows.cpp
! src/share/vm/logging/logFileOutput.cpp
! src/share/vm/runtime/os.hpp

Changeset: 0f1865d9ecda
Author:    coleenp
Date:      2016-04-22 14:48 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/0f1865d9ecda

Merge