hg: code-tools/jmh: 7901330: Fork annotation value on class ignored in presence of Fork annotation on Benchmark

[aleksey.shipilev at oracle.com]

Changeset: b33187f91f94
Author:    shade
Date:      2015-03-31 11:14 +0300
URL:       http://hg.openjdk.java.net/code-tools/jmh/rev/b33187f91f94

7901330: Fork annotation value on class ignored in presence of Fork annotation on Benchmark
Summary: Implement per-parameter annotation merging.

+ jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkMergeTest.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmAppendPrependArgs2_Test.java
! jmh-core-it/src/test/java/org/openjdk/jmh/it/fork/ForkedJvmArgs2_Test.java
! jmh-core/src/main/java/org/openjdk/jmh/generators/core/BenchmarkGeneratorUtils.java
! jmh-core/src/main/java/org/openjdk/jmh/generators/core/MethodGroup.java