Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorddmitriev
Wed, 27 Jan 2016 14:14:36 +0100
changeset 35855 c23bcb9faeb0
parent 35853 9cffac525e28 (current diff)
parent 35854 d6e6f0a781e4 (diff)
child 35857 1c930000fd18
child 35860 c679e1ab7e9c
Merge
--- a/hotspot/test/serviceability/dcmd/gc/HeapDumpAllTest.java	Wed Jan 27 11:41:44 2016 +0100
+++ b/hotspot/test/serviceability/dcmd/gc/HeapDumpAllTest.java	Wed Jan 27 14:14:36 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -33,7 +33,7 @@
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
  * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.module.*
+ * @build jdk.test.lib.hprof.model.*
  * @build jdk.test.lib.hprof.parser.*
  * @build jdk.test.lib.hprof.utils.*
  * @build HeapDumpTest
--- a/hotspot/test/serviceability/dcmd/gc/HeapDumpTest.java	Wed Jan 27 11:41:44 2016 +0100
+++ b/hotspot/test/serviceability/dcmd/gc/HeapDumpTest.java	Wed Jan 27 14:14:36 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -49,7 +49,7 @@
  * @build jdk.test.lib.*
  * @build jdk.test.lib.dcmd.*
  * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.module.*
+ * @build jdk.test.lib.hprof.model.*
  * @build jdk.test.lib.hprof.parser.*
  * @build jdk.test.lib.hprof.utils.*
  * @run testng HeapDumpTest
jdk-sandbox