Mercurial > hg > openjdk > jdk7 > hotspot

changeset 2547:b36598cf2c62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jcoomes
date Fri, 27 May 2011 23:55:49 -0700
parents d920485ae93b (diff) 8cbcd406c42e (current diff)
children 472fc37e14a9
files
diffstat 13 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri May 27 15:05:33 2011 -0700
+++ b/.hgtags	Fri May 27 23:55:49 2011 -0700
@@ -172,3 +172,6 @@
 3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
 9ad1548c6b63d596c411afc35147ffd5254426d9 jdk7-b142
 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
+c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
+c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
+fe189d4a44e9e8f0c7d78fcbd1c63701745752ca jdk7-b144
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java	Fri May 27 15:05:33 2011 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, 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/make/linux/README	Fri May 27 15:05:33 2011 -0700
+++ b/make/linux/README	Fri May 27 23:55:49 2011 -0700
@@ -1,4 +1,4 @@
-Copyright (c) 2007 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 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/make/windows/projectfiles/kernel/Makefile	Fri May 27 15:05:33 2011 -0700
+++ b/make/windows/projectfiles/kernel/Makefile	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2010, 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/src/cpu/x86/vm/vm_version_x86.cpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/cpu/x86/vm/vm_version_x86.cpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates.  All Rights Reserved.
+ * Copyright (c) 1997, 2011, 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/src/cpu/x86/vm/vm_version_x86.hpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/cpu/x86/vm/vm_version_x86.hpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates.  All Rights Reserved.
+ * Copyright (c) 1997, 2010, 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/src/os_cpu/solaris_sparc/vm/solaris_sparc.s	Fri May 27 15:05:33 2011 -0700
+++ b/src/os_cpu/solaris_sparc/vm/solaris_sparc.s	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 !!
-!! Copyright (c) 2005, 2008 Oracle and/or its affiliates. All rights reserved.
+!! Copyright (c) 2005, 2008, 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/src/share/tools/hsdis/README	Fri May 27 15:05:33 2011 -0700
+++ b/src/share/tools/hsdis/README	Fri May 27 23:55:49 2011 -0700
@@ -1,4 +1,4 @@
-Copyright (c) 2008 Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 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/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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/src/share/vm/gc_implementation/g1/heapRegionSets.hpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/share/vm/gc_implementation/g1/heapRegionSets.hpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2011, 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/src/share/vm/utilities/yieldingWorkgroup.cpp	Fri May 27 15:05:33 2011 -0700
+++ b/src/share/vm/utilities/yieldingWorkgroup.cpp	Fri May 27 23:55:49 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, 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