[testng] 163/355: Merge pull request #617 from juherr/inject-parent-module

[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 a0deae2b7f7f7815c68aaa31fca8c0be562ad297
Merge: 1b639ad 1770885
Author: Cedric Beust <cedric at beust.com>
Date:   Thu Mar 12 09:52:36 2015 -0700

    Merge pull request #617 from juherr/inject-parent-module
    
    Inject context in parent module

 CHANGES.txt                                         |  2 ++
 build-tests.xml                                     |  2 +-
 build.xml                                           | 10 +++++-----
 pom.xml                                             |  2 +-
 src/main/java/org/testng/internal/ClassHelper.java  |  9 +++++++++
 src/main/java/org/testng/internal/ClassImpl.java    | 14 ++++++++++++--
 src/test/java/test/guice/GuiceParentModule.java     | 10 ++++++++++
 src/test/java/test/guice/GuiceParentModuleTest.java |  6 ++++++
 8 files changed, 46 insertions(+), 9 deletions(-)

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