hg: jdk/hs: 2 new changesets

[bob.vandette at oracle.com]

Changeset: 15765495db12
Author:    bobv
Date:      2018-02-23 10:17 -0500
URL:       http://hg.openjdk.java.net/jdk/hs/rev/15765495db12

8197589: Update CPU count algorithm when both cpu shares and quotas are used
Reviewed-by: dholmes, mseledtsov

! src/hotspot/os/linux/globals_linux.hpp
! src/hotspot/os/linux/osContainer_linux.cpp
! test/hotspot/jtreg/runtime/containers/docker/TestCPUAwareness.java

Changeset: c548301de07e
Author:    bobv
Date:      2018-02-23 12:08 -0500
URL:       http://hg.openjdk.java.net/jdk/hs/rev/c548301de07e

Merge