hg: jdk7/jdk7/jdk: 2 new changesets

[erik.trimble at oracle.com]

Changeset: 28269923b747
Author:    fparain
Date:      2011-05-06 18:09 +0200
URL:       http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/28269923b747

7028071: Add two attributes to the OperatingSystemMXBean to provide CPU Load info
Summary: Add getProcessCpuLoad() and getSystemCpuLoad() to the OperatingSystemMXBean
Reviewed-by: acorn, dholmes, mchung

! make/java/management/Makefile
! make/java/management/mapfile-vers
! src/share/classes/com/sun/management/OperatingSystemMXBean.java
! src/solaris/classes/com/sun/management/UnixOperatingSystem.java
+ src/solaris/native/com/sun/management/LinuxOperatingSystem.c
+ src/solaris/native/com/sun/management/SolarisOperatingSystem.c
! src/windows/classes/com/sun/management/OperatingSystem.java
! src/windows/native/com/sun/management/OperatingSystem_md.c
+ test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java
+ test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java

Changeset: 0f4a9ce78cf9
Author:    trims
Date:      2011-05-10 18:31 -0700
URL:       http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/0f4a9ce78cf9

Merge