# HG changeset patch # User asaha # Date 1459797508 25200 # Node ID 34429bad9986677f4991c80aeb22665842881cba # Parent 6bd69608ca930253493301d797f99cb608d55141# Parent 445941ba41c0e3829fe02140690b144281ac2141 Merge diff -r 445941ba41c0 -r 34429bad9986 .hgtags --- a/.hgtags Thu Mar 31 14:23:12 2016 -0700 +++ b/.hgtags Mon Apr 04 12:18:28 2016 -0700 @@ -598,6 +598,7 @@ 6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27 8220f68a195f6eeed2f5fb6e8a303726b512e899 jdk8u40-b31 850a290eb1088a61178d1910c500e170ef4f4386 jdk8u40-b32 +e6aa4a8c1b46a05b6c493b4ffe5c2555013f5c99 jdk8u40-b33 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11 @@ -815,11 +816,14 @@ 1b4072e4bb3ad54c4e894998486a8b33f0689160 jdk8u77-b02 223b64a19e94222dd97b92bb40abcfbc0bf6ef1f jdk8u77-b03 dd8507f51d786572dae18af8ffdc5a1ea34c755e jdk8u77-b31 + +94ec11846b18111e73929b6caa9fbe7262e142c1 jdk8u74-b32 da43260704c28b9f19cb652090ae65c258220fd6 jdk8u72-b31 c0242ea4bde19d72be5149feda112a39e8c89b0a jdk8u75-b00 ca3b8c8e390ab0540b0cc2e5def869b38e460d86 jdk8u75-b01 9aef5b5e0a68f20059cfa9e2806b4ff0e11a3d31 jdk8u75-b02 2df9fe896819362b9075a670b78106b249e50d6d jdk8u75-b03 +b374548dcb4834eb8731a06b52faddd0f10bd45d jdk8u101-b00 32b682649973231b54740c09b10889660f6ebde5 jdk8u75-b04 1f43bd4fab06d2ca5d1964611df14d8506d6b36e jdk8u75-b05 916712f178c39d0acbc590f38802133fc86a7346 jdk8u75-b06 @@ -851,3 +855,5 @@ 481dcde745b6aec035781ed9f6797cfc93719f71 jdk8u92-b00 f3e1e734e2d29101a9537ddeb71ecad413fcd352 jdk8u92-b13 24a09407d71bb2cc4848bfa21660c890b4d722b1 jdk8u92-b14 +b374548dcb4834eb8731a06b52faddd0f10bd45d jdk8u81-b00 +ead07188d11107e877e8e4ad215ff6cb238a8a92 jdk8u101-b01 diff -r 445941ba41c0 -r 34429bad9986 src/share/vm/prims/jni.cpp