changeset 24280:b0f2296a0bc8

Merge
author robm
date Fri, 07 Oct 2016 14:34:32 +0000
parents d3b4ef97a518 f7b4a17a9d49
children c1512e3a4f5f ee8de3bfd6b0 f973811078b9
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	Mon Oct 03 11:19:32 2016 -0700
+++ b/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp	Fri Oct 07 14:34:32 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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/gc/TestSoftReferencesBehaviorOnOOME.java	Mon Oct 03 11:19:32 2016 -0700
+++ b/test/gc/TestSoftReferencesBehaviorOnOOME.java	Fri Oct 07 14:34:32 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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