[testng] 349/355: Merge remote-tracking branch 'origin/master' into issue-420

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 46d5b095a7e526973c2b2ce0d6828dd5e422e411
Merge: 5908b97 eb7327c
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Thu May 21 18:24:58 2015 +0200

    Merge remote-tracking branch 'origin/master' into issue-420
    
    Conflicts:
    	CHANGES.txt

 CHANGES.txt                                        |  2 ++
 .../annotations/JDK15AnnotationFinder.java         | 12 ++++-----
 .../AnnotationTransformerTest.java                 | 20 +++++++++++++++
 .../annotationtransformer/MyParamTransformer.java  | 30 ++++++++++++++++++++++
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --cc CHANGES.txt
index 0200e43,27ac5f0..fdef559
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -2,9 -2,8 +2,10 @@@ Curren
  
  Fixed: The ServiceLoaderTest on Windows (Mathieu Sebire)
  Fixed: GITHUB-691: Fix classloading issue when using TestNG 6.9.4 and JMockit. (Mathieu Sebire)
+ Fixed: GITHUB-686: IAnnotationTransformer.transform is called for methods with testClass populated. (Łukasz Rekucki & Julien Herr)
 +Fixed: GITHUB-420: Before/AfterSuite methods may not run, when use inheritance, and enabled=false (Jakub Tokaj & Julien Herr)
  
 +===========================================================================
  6.9.4:
  2015/05/09
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git