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 f836d4cc8cfbac9cfeb83f8c37d78f427999ac8b Merge: 3940bc2 6590b7b Author: Cedric Beust <[email protected]> Date: Sat Jun 13 08:39:37 2015 -0700 Merge branch 'issue-712' of https://github.com/juherr/testng into juherr-issue-712 Conflicts: CHANGES.txt CHANGES.txt | 1 + src/main/java/org/testng/internal/YamlParser.java | 9 +++++-- src/main/java/org/testng/xml/ISuiteParser.java | 6 +++++ src/main/java/org/testng/xml/Parser.java | 28 ++++++++++++---------- src/main/java/org/testng/xml/SuiteXmlParser.java | 8 ++++--- src/main/java/org/testng/xml/dom/DomXmlParser.java | 8 ++++++- .../META-INF/services/org.testng.xml.ISuiteParser | 1 + 7 files changed, 43 insertions(+), 18 deletions(-) diff --cc CHANGES.txt index fa69554,a801756..311f719 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -8,7 -8,7 +8,8 @@@ Fixed: GITHUB-697: Make addFailedInvoca Fixed: GITHUB-698: Fix exit code reporting when IRetryAnalyzer is used (Ryan Schmitt) Fixed: GITHUB-465: assertEquals(Collection, Collection) prints "null" when collections are different sizes (Michael Diamond) New: GITHUB-710: AppVeyor is used for continuous integration on Windows (Julien Herr) +Fixed: GITHUB-599: IHookable ignored when a timeout is set (@ryanlevell & Julien Herr) + New: GITHUB-723: Allow users to add their own suite parser (Julien Herr) Eclipse: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
