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

[daniel.daugherty at oracle.com]

Changeset: 1a85bb362183
Author:    dcubed
Date:      2015-10-15 10:00 -0700
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/1a85bb362183

8136552: Last argument wins does not work for special options with "-XX:VMOptionsFile" option
Summary: match_special_option_and_act() should insert_vm_options_file() earlier and process the inserted options right away to honor "last option wins" semantics.
Reviewed-by: dcubed, coleenp

! src/share/vm/runtime/arguments.cpp
! test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java

Changeset: cdd81465ef70
Author:    dcubed
Date:      2015-10-15 19:17 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/cdd81465ef70

Merge