changeset 7461:aa559d55fc4a

Merge
author chegar
date Fri, 31 May 2013 10:34:25 +0100
parents 60a2184a71f2 3c08c9ebd1fb
children 405cd7338069
files
diffstat 19 files changed, 20 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu May 23 12:58:51 2013 +0100
+++ b/.hgtags	Fri May 31 10:34:25 2013 +0100
@@ -212,3 +212,5 @@
 8dbb4b159e04de3c447c9242c70505e71f8624c7 jdk8-b88
 845025546e35519fbb8970e79fc2a834063a5e19 jdk8-b89
 c63eda8f63008a4398d2c22ac8d72f7fef6f9238 jdk8-b90
+169451cf0cc53bde5af24f9820ea3f35ec4b4df4 jdk8-b91
+a2a2a91075ad85becbe10a39d7fd04ef9bea8df5 jdk8-b92
--- a/test/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/java/util/stream/test/org/openjdk/tests/java/util/FillableStringTest.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/java/util/stream/test/org/openjdk/tests/java/util/MapTest.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/MethodReferenceTestInstanceMethod.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/MethodReferenceTestInstanceMethod.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/MethodReferenceTestKinds.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/MethodReferenceTestKinds.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/MethodReferenceTestSueCase1.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/MethodReferenceTestSueCase1.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/MethodReferenceTestSueCase2.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/MethodReferenceTestSueCase2.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/MethodReferenceTestSueCase4.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/MethodReferenceTestSueCase4.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/AttributeInjector.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/AttributeInjector.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/ClassFile.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/ClassFile.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/ClassFilePreprocessor.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/ClassFilePreprocessor.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/ClassToInterfaceConverter.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/ClassToInterfaceConverter.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/Compiler.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/Compiler.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/DirectedClassLoader.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/DirectedClassLoader.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/SourceModel.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/SourceModel.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/separate/TestHarness.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/separate/TestHarness.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/vm/DefaultMethodRegressionTests.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/vm/DefaultMethodRegressionTests.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/vm/DefaultMethodsTest.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/vm/DefaultMethodsTest.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/jdk/lambda/vm/InterfaceAccessFlagsTest.java	Thu May 23 12:58:51 2013 +0100
+++ b/test/jdk/lambda/vm/InterfaceAccessFlagsTest.java	Fri May 31 10:34:25 2013 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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