Changeset 390 for trunk/openjdk/jdk/test/sun

Timestamp:

Jul 2, 2012, 3:05:26 PM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b25 from branches/vendor/oracle.

This accompanies an incomplete r389.

Location:

trunk/openjdk/jdk/test/sun

Files:

• security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs )
• security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java )
• security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh (copied) (copied from branches/vendor/oracle/openjdk6/b25/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh )
• tools/jstatd/jstatdExternalRegistry.sh (modified) (1 diff)

trunk/openjdk/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh

@@ -1 +1 @@
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #