hg: jdk7u/jdk7u/jdk: 16 new changesets

[chris.gruszka at oracle.com]

Changeset: 44d1f9532dab
Author:    cgruszka
Date:      2012-01-20 06:50 -0500
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/44d1f9532dab

Merge


Changeset: 87345cee010c
Author:    cgruszka
Date:      2012-01-23 14:47 -0500
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/87345cee010c

Merge


Changeset: 793db974858e
Author:    cgruszka
Date:      2012-01-27 15:15 -0500
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/793db974858e

Merge


Changeset: ff57973632ad
Author:    cgruszka
Date:      2012-02-03 10:33 -0500
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/ff57973632ad

Merge

- test/java/io/File/BlockIsDirectory.java

Changeset: 71ff554d45cd
Author:    cgruszka
Date:      2012-02-10 04:07 -0500
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/71ff554d45cd

Merge

- src/solaris/bin/java_md.c

Changeset: f11e2cb94154
Author:    cgruszka
Date:      2012-02-28 13:33 -0500
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/f11e2cb94154

Merge

- src/macosx/bin/universal/jvm.cfg
- src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java
- src/share/classes/com/sun/management/DiagnosticCommandInfo.java
- test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java
- test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java
- test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java

Changeset: f9d88851f1fc
Author:    cgruszka
Date:      2012-03-14 17:16 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/f9d88851f1fc

Merge


Changeset: 712ddd5cd31c
Author:    cgruszka
Date:      2012-03-20 11:00 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/712ddd5cd31c

Merge


Changeset: c3a8fa474dab
Author:    cgruszka
Date:      2012-03-28 10:24 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/c3a8fa474dab

Merge

- test/java/io/FileDescriptor/FileChannelFDTest.java

Changeset: 42b162b2d764
Author:    cgruszka
Date:      2012-04-03 12:07 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/42b162b2d764

Merge


Changeset: d1b9d039fb26
Author:    cgruszka
Date:      2012-04-06 10:54 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/d1b9d039fb26

Merge


Changeset: a2f0e47299a7
Author:    cgruszka
Date:      2012-04-17 21:26 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/a2f0e47299a7

Merge


Changeset: 791ad9acadef
Author:    cgruszka
Date:      2012-04-18 23:54 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/791ad9acadef

Merge


Changeset: 3bf9fb6f6aba
Author:    skovatch
Date:      2012-04-25 13:40 -0700
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/3bf9fb6f6aba

7128699: Change the bundle name so it won't be overwritten when installing a new version
Reviewed-by: robilad

! make/common/Release-macosx.gmk

Changeset: 224011dbdf1f
Author:    cgruszka
Date:      2012-04-30 23:22 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/224011dbdf1f

Merge

! make/common/Release-macosx.gmk

Changeset: 9e4fcaae8175
Author:    cgruszka
Date:      2012-05-03 00:10 -0400
URL:       http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/rev/9e4fcaae8175

Merge