changeset 7602:030d1ca7432f

Merge
author katleman
date Thu, 11 Jul 2013 14:34:18 -0700
parents 758c21301545 56bc019a0525
children 6a099a36589b
files
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/security/krb5/auto/NoneReplayCacheTest.java	Thu Jul 11 10:13:49 2013 -0700
+++ b/test/sun/security/krb5/auto/NoneReplayCacheTest.java	Thu Jul 11 14:34:18 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 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
@@ -16,10 +16,10 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+*/
 
 /*
  * @test