hg: verona/stage/hotspot: 2 new changesets

[magnus.ihse.bursie at oracle.com]

Changeset: 5b88604f11a1
Author:    ihse
Date:      2015-06-12 08:31 +0200
URL:       http://hg.openjdk.java.net/verona/stage/hotspot/rev/5b88604f11a1

8085822: JEP 223: New Version-String Scheme (initial integration)
Reviewed-by: erikj, dcubed, dholmes, alanb
Contributed-by: Magnus Ihse Bursie <magnus.ihse.bursie at oracle.com>, Alejandro E Murillo <alejandro.murillo at oracle.com>

! make/Makefile
! make/aix/Makefile
! make/aix/makefiles/buildtree.make
! make/aix/makefiles/defs.make
! make/aix/makefiles/vm.make
! make/bsd/Makefile
! make/bsd/makefiles/buildtree.make
! make/bsd/makefiles/defs.make
! make/bsd/makefiles/vm.make
! make/defs.make
- make/jdk6_hotspot_distro
! make/jdk_version
! make/linux/Makefile
! make/linux/makefiles/buildtree.make
! make/linux/makefiles/defs.make
! make/linux/makefiles/vm.make
! make/solaris/Makefile
! make/solaris/makefiles/buildtree.make
! make/solaris/makefiles/defs.make
! make/solaris/makefiles/sparcWorks.make
! make/solaris/makefiles/vm.make
! make/windows/build.make
! make/windows/makefiles/compile.make
! make/windows/makefiles/debug.make
! make/windows/makefiles/defs.make
! make/windows/makefiles/fastdebug.make
! make/windows/makefiles/product.make
! make/windows/makefiles/vm.make
! make/windows/projectfiles/common/Makefile
! src/share/vm/prims/jvm.h
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/java.cpp
! src/share/vm/runtime/java.hpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/runtime/vm_version.cpp
! src/share/vm/runtime/vm_version.hpp
! test/runtime/6981737/Test6981737.java

Changeset: befaf8025423
Author:    ihse
Date:      2015-06-12 08:32 +0200
URL:       http://hg.openjdk.java.net/verona/stage/hotspot/rev/befaf8025423

Merge

! src/share/vm/runtime/arguments.cpp