# HG changeset patch
# User jiangli
# Date 1414119839 0
# Node ID 1bd99e1dc168a5d2521e10c00a2140dddae74a79
# Parent  68dd4d2b8dc00f82f73a21b5470ffbbbd2626131# Parent  20ce707c3abaa66037fdd148f143dc271a30fe7c
Merge

diff -r 20ce707c3aba -r 1bd99e1dc168 make/hotspot_version
--- a/make/hotspot_version	Fri Oct 24 02:41:37 2014 +0000
+++ b/make/hotspot_version	Fri Oct 24 03:03:59 2014 +0000
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=40
-HS_BUILD_NUMBER=16
+HS_BUILD_NUMBER=17
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8