[testng] 127/160: Merge branch 'issue-739' into issue-471

[Eugene Zhukov]

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

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

commit b2ef18e9f54042b59f9d15cc2f9027423ad566a8
Merge: f11019b bc610fb
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Sat Jun 27 14:34:42 2015 +0200

    Merge branch 'issue-739' into issue-471

 CHANGES.txt                                        |  3 ++-
 src/main/java/org/testng/internal/Invoker.java     |  7 ++---
 src/test/java/test/InvokedMethodNameListener.java  | 30 +++++++++++++++++++++-
 .../{ => inheritance}/testng234/ChildTest.java     |  2 +-
 .../{ => inheritance}/testng234/ParentTest.java    |  2 +-
 .../testng234/PolymorphicFailureTest.java          |  2 +-
 src/test/java/test/inheritance/testng739/A.java    | 17 ++++++++++++
 src/test/java/test/inheritance/testng739/B.java    | 10 ++++++++
 .../java/test/inheritance/testng739/BaseClass.java |  9 +++++++
 .../java/test/inheritance/testng739/TestNG739.java | 26 +++++++++++++++++++
 src/test/resources/testng.xml                      |  3 ++-
 11 files changed, 100 insertions(+), 11 deletions(-)

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