diff options
| author | katleman <none@none> | 2013-04-17 12:38:58 -0700 |
|---|---|---|
| committer | katleman <none@none> | 2013-04-17 12:38:58 -0700 |
| commit | 5b1438c89ef3844ce7beabf10efc6127e9f4ed46 (patch) | |
| tree | ab0b50d8fe7ab316459c9f78f1249ffd2f7d5074 | |
| parent | bca573758e8e9b26fd9340d5cba74279d8afcf13 (diff) | |
| parent | 33c7c48e0cbb0ad600cf2b989e58c91444ec13ae (diff) | |
Mergejdk8-b86
| -rw-r--r-- | make/bsd/makefiles/fastdebug.make | 2 | ||||
| -rw-r--r-- | src/share/vm/services/diagnosticArgument.cpp | 2 | ||||
| -rw-r--r-- | test/sanity/WBApi.java | 2 | ||||
| -rw-r--r-- | test/serviceability/ParserTest.java | 2 | ||||
| -rw-r--r-- | test/testlibrary/whitebox/sun/hotspot/WhiteBox.java | 2 | ||||
| -rw-r--r-- | test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/make/bsd/makefiles/fastdebug.make b/make/bsd/makefiles/fastdebug.make index c59310634..e175622ee 100644 --- a/make/bsd/makefiles/fastdebug.make +++ b/make/bsd/makefiles/fastdebug.make @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 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 diff --git a/src/share/vm/services/diagnosticArgument.cpp b/src/share/vm/services/diagnosticArgument.cpp index 5d0eb756b..022687db4 100644 --- a/src/share/vm/services/diagnosticArgument.cpp +++ b/src/share/vm/services/diagnosticArgument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 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 diff --git a/test/sanity/WBApi.java b/test/sanity/WBApi.java index a9cbe21b9..3d9267771 100644 --- a/test/sanity/WBApi.java +++ b/test/sanity/WBApi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 diff --git a/test/serviceability/ParserTest.java b/test/serviceability/ParserTest.java index af55a9879..63ee9210e 100644 --- a/test/serviceability/ParserTest.java +++ b/test/serviceability/ParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 diff --git a/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java index 56e609254..400bff7c1 100644 --- a/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java +++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 diff --git a/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java index cc40007f8..ad4ebcc73 100644 --- a/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java +++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 |