# HG changeset patch
# User asaha
# Date 1405378129 25200
# Node ID 341af2f085158920b00a7d484e1502ac64e634c5
# Parent  9826742fa96a09da4ddf76324c205961626a9510# Parent  1ff7622846cf04755c3c3e9ff451d85a2d78f8d5
Merge

diff -r 1ff7622846cf -r 341af2f08515 .hgtags
--- a/.hgtags	Mon Jul 14 15:08:04 2014 -0700
+++ b/.hgtags	Mon Jul 14 15:48:49 2014 -0700
@@ -504,3 +504,4 @@
 db8383148bc9417dd4c38fa4cea39510f17325f3 jdk8u25-b05
 605df8463453628df49351fa63632666f18698cd jdk8u25-b06
 520188d4bade17dbe75163d1f635c08168ea560c jdk8u25-b07
+5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00
diff -r 1ff7622846cf -r 341af2f08515 make/hotspot_version
--- a/make/hotspot_version	Mon Jul 14 15:08:04 2014 -0700
+++ b/make/hotspot_version	Mon Jul 14 15:48:49 2014 -0700
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,10 +31,10 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2014
+HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=25
+HS_MINOR_VER=31
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1