# HG changeset patch
# User asaha
# Date 1441821512 25200
# Node ID acf5ee7234390ceea4f209e1e0b6f82e57f7fc71
# Parent  c1374141598ca012940e687d29fda7102df127c9# Parent  822b661ed05ae6531cd77254c1f8619829c9ac60
Merge

diff -r c1374141598c -r acf5ee723439 .hgtags
--- a/.hgtags	Sun Sep 06 05:02:06 2015 -0700
+++ b/.hgtags	Wed Sep 09 10:58:32 2015 -0700
@@ -597,6 +597,35 @@
 6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
 8220f68a195f6eeed2f5fb6e8a303726b512e899 jdk8u40-b31
 850a290eb1088a61178d1910c500e170ef4f4386 jdk8u40-b32
+1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
+f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
+99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
+8b9ec2da541a74ac698560b6a2bc45fccb789919 hs25.40-b16
+6b93bf9ea3ea57ed0fe53cfedb2f9ab912c324e5 jdk8u40-b12
+521e269ae1daa9df1cb0835b97aa76bdf340fcb2 hs25.40-b17
+86307d47790785398d0695acc361bccaefe25f94 jdk8u40-b13
+4d5dc0d0f8799fafa1135d51d85edd4edd566501 hs25.40-b18
+b8ca8ec1daea70f7c0d519e866f9f147ec247055 jdk8u40-b14
+eb16b24e2eba9bdf04a9b377bebc2db9f713ff5e jdk8u40-b15
+3a8a0fd171c5876023112941b1c7254262f9adfc hs25.40-b19
+aa2442f89230dc46147c721812f3b3bd4c612e83 hs25.40-b20
+5ea68fb91139081304357f9b937f32c5fdfeca6d jdk8u40-b16
+6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21
+fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
+bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
+31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18
+f8fc5cbe082ce0fb0c6c1dcd39493a16ed916353 hs25.40-b23
+d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u40-b19
+c3933f52eeb33f70ee562464edddfe9f01d944fd jdk8u40-b20
+d2e9a6bec4f2eec8506eed16f7324992a85d8480 hs25.40-b24
+25ec4a67433744bbe3406e5069e7fd1876ebbf2f jdk8u40-b21
+0f0cb4eeab2d871274f4ffdcd6017d2fdfa89238 hs25.40-b25
+0ee548a1cda08c884eccd563e2d5fdb6ee769b5a jdk8u40-b22
+0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23
+fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
+698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25
+f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26
+6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
 b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02
@@ -615,6 +644,11 @@
 a5ba7c9a0b916ea088aaac5d40e17b4675c2b026 jdk8u45-b15
 894b92a02c533bcd1203c4beb5b6ec067b63466e jdk8u45-b31
 1428b6aa09c4e17202b801530c3c4993c7ce8e5b jdk8u45-b32
+9b2bf0d8a9a0fa7fe7486eb29454eae4b08f3d82 jdk8u45-b33
+dc3c47fc6218003b23338b978b3f13a6d7976b41 jdk8u45-b34
+3cb364e46590add7cb42ec8b6565a3c62adf824d jdk8u45-b35
+48b09bb741171b0069000ac1cf5407ef2357d3d1 jdk8u45-b36
+3c2ea5da6afd55a524e25dc56747940324befda2 jdk8u45-b37
 b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00
 c1de2652a48c1d4a0c96707acc73db3cd317df2a jdk8u51-b01
 8f03c2f5fc170da5fca2cf65734941efb619feca jdk8u51-b02
@@ -632,6 +666,7 @@
 a4eea4bee2d4fdb05f1a8358d70ec6adb1135526 jdk8u51-b14
 9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15
 3639e38bd73f5efa8ce092f0a745bb0c90759575 jdk8u51-b16
+20bad8c6c7b406c3603b4e22b15cd990840a9d62 jdk8u51-b31
 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00
 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00
 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01
@@ -682,9 +717,35 @@
 0e4094950cd312c8f95c7f37336606323fe049fe jdk8u60-b23
 d89ceecf1bad55e1aee2932b8895d60fc64c15db hs25.60-b23
 fb157d537278cda4150740e27bb57cd8694e15bf jdk8u60-b24
+6b4ea38c01bd9cc86d0aa8926f4855ff6ee365ee jdk8u60-b25
+6a6759372807f49aa7a66ddc36aa91d6648d2097 jdk8u60-b26
+10ad4b9d79f98fa3545c88a342a68a80d198b808 jdk8u60-b27
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
+9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
+b6815d853c359be92e61f422ea5018af1f81d0c7 jdk8u65-b01
+488661b9cbdaeb24be14873f3bd39a945575692a jdk8u65-b02
+ea47136e6ea4253c0bf238fb61760f98a8d01ebc jdk8u65-b03
+2a03fd592fe60fd113c1c89e431ebaa6857c4998 jdk8u65-b04
+aa915217a00c4b8ce0e82d1b23fa1df8a9e4cc70 jdk8u65-b05
+3070e116da4cfebc2ceb0df8f40faeefd38a6d4a jdk8u65-b06
+008b42595f2babc98e1b23bc00f27e308f9a35b9 jdk8u65-b07
+d8519b30e607f87cad6c949c6b52c1dba0cde7a8 jdk8u65-b08
+c6d1a21e213d62f423ac9013bcc7dc0bc05e38b6 jdk8u65-b09
+0274b03fdf4a3e4d125547d68ed74b4f55d515ec jdk8u65-b10
+a106723ba50719c479614d1f599e951edb51506c jdk8u65-b11
+a5fbc6967cf5d170be56c9804b90ebb6bbd02832 jdk8u65-b12
+529bea83b67412ffb5a7eb0ed8f8772732bbf446 jdk8u65-b13
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
 47110b037994f9006c22abcb12569fcafad84edb hs25.66-b03
 ae5624088d86abe8e7981dbb893c1b6da5140a1c jdk8u66-b02
+6594411c4eb4d00e439330a61744f077d0b96363 jdk8u66-b07
+aedefb75358f3cda5181bf594c2cda833056b25a jdk8u66-b08
+83621deea0fcb4a517b94c5546b4f8738588cb6c jdk8u66-b09
+5280a8174aea13bd242480419e6228857dac7b59 jdk8u66-b10
+8a23b6392c590b7bf5f6ad2c4746dc03981a7f60 jdk8u66-b11
+ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12
+4d699853544cf869d4edaf23b7cc9cfbb2900a2b jdk8u66-b13
 b8f426369187c32551f0a3d571d933908988c81c jdk8u72-b00
diff -r c1374141598c -r acf5ee723439 make/hotspot_version
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/g1OopClosures.hpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/g1RemSet.cpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/heapRegion.cpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/gc_implementation/g1/heapRegion.hpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/memory/genCollectedHeap.cpp
diff -r c1374141598c -r acf5ee723439 src/share/vm/runtime/arguments.cpp