[testng] 325/355: Merge branch 'master' into gradle

[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 58629773581603afc7e07fcaa08c39acbc40eaa5
Merge: 82848e4 334318e
Author: Cedric Beust <cedric at beust.com>
Date:   Mon May 11 18:07:46 2015 -0700

    Merge branch 'master' into gradle

 src/main/java/org/testng/asserts/Assertion.java    | 782 +++------------------
 src/main/java/org/testng/asserts/IAssert.java      |   6 +-
 .../java/org/testng/asserts/IAssertLifecycle.java  |  12 +-
 .../java/org/testng/asserts/LoggingAssert.java     |   2 +-
 src/main/java/org/testng/asserts/SoftAssert.java   |   6 +-
 src/test/java/test/assertion/AssertionTest.java    |  29 +
 src/test/java/test/assertion/MyRawAssertion.java   |  72 ++
 7 files changed, 206 insertions(+), 703 deletions(-)

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