changeset 1352:d363179c431c

Merge
author asaha
date Tue, 10 May 2016 12:13:47 -0700
parents 3eac78bf6732 0dcc485c5c19
children bd20023c7d12
files .hgtags
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 28 09:48:54 2016 -0700
+++ b/.hgtags	Tue May 10 12:13:47 2016 -0700
@@ -636,6 +636,8 @@
 371b0c5477d8613c06fd1206deed27759f18e42e jdk8u101-b03
 52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u101-b04
 3edb6296456161d67bf33a73faf18dc57ef548de jdk8u101-b05
+37bd092c2a7a9e71c027a33757429e02e00050de jdk8u101-b06
+df3cd274d224e22e156556bc0d7b8927b72a7608 jdk8u101-b07
 223d0e48a55b92255f5a613743a99e7deacaf455 jdk8u102-b00
 223d0e48a55b92255f5a613743a99e7deacaf455 jdk8u82-b00
 9d09a2f1395561fe71b1a83f53907ddc52e699d6 jdk8u102-b01
@@ -643,4 +645,6 @@
 ab7dbd58a766fb01c6643f3a80c9e96ac1278a06 jdk8u102-b03
 626d8fa7a1bfd9e65b94117a526ba57b25ec3d14 jdk8u102-b04
 3c35b66b5345f615a3ff626111587c452c8c3893 jdk8u102-b05
+2a265ab91dd234348630dab92f622a616ab76a0e jdk8u102-b06
+8d44271dd11dd4bdc88ef647fd144e544791ecc4 jdk8u102-b07
 52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u111-b00
--- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java	Thu Apr 28 09:48:54 2016 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java	Tue May 10 12:13:47 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, 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