[testng] 157/355: Merge remote-tracking branch 'upstream/master'

[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 3d31f0d5e2240491699c7c9bcc28d018ef7830f2
Merge: 2403bad 1b639ad
Author: vmwareuser <vmwareuser at jdillet-ubuntu-dev.(none)>
Date:   Mon Feb 23 17:49:12 2015 +0200

    Merge remote-tracking branch 'upstream/master'

 src/main/java/org/testng/SuiteRunner.java          |  6 ++-
 src/main/java/org/testng/TestNG.java               |  2 +-
 src/main/java/org/testng/xml/LaunchSuite.java      |  6 ++-
 .../SuiteAndConfigurationListenerTest.java         | 58 ++++++++++++++++++++++
 src/test/resources/testng.xml                      |  1 +
 5 files changed, 69 insertions(+), 4 deletions(-)

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