hg: hsx/hotspot-rt/hotspot: 2 new changesets

[daniel.daugherty at oracle.com]

Changeset: 4a1efab850f4
Author:    shade
Date:      2013-08-26 17:42 +0400
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/4a1efab850f4

8023638: Add the regression test for 8006997
Summary: Add the relevant test and proofread the VM messages as well
Reviewed-by: coleenp, mseledtsov, dcubed

! src/share/vm/runtime/arguments.cpp
+ test/runtime/contended/Options.java

Changeset: a7d8baf4cca7
Author:    dcubed
Date:      2013-08-26 18:34 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/a7d8baf4cca7

Merge