This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jbehave-core".
The branch, master has been updated
via a0a8bf64bd2cc298a5278a1a4b0d7872b3fe9df2 (commit)
via 48dd1d3c916081b58fe1756931070f65ab4803ea (commit)
from d4bb4c159db2e3f81892cfb6231edff4cf1ef0d8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a0a8bf64bd2cc298a5278a1a4b0d7872b3fe9df2
Merge: 48dd1d3c916081b58fe1756931070f65ab4803ea
d4bb4c159db2e3f81892cfb6231edff4cf1ef0d8
Author: Mauro Talevi <[email protected]>
Date: Sun May 9 17:40:32 2010 +0100
Resolved merge conflicts
commit 48dd1d3c916081b58fe1756931070f65ab4803ea
Author: Mauro Talevi <[email protected]>
Date: Sun May 9 18:27:04 2010 +0200
JBEHAVE-284: Reporter delegates are now only held in
DelegatingStoryReporter.
Allowed StoryRunnerMode flags to be set one by one.
-----------------------------------------------------------------------
Summary of changes:
.../trader/jbehave-reports/rendered/index.html | 60 ------------------
.../trader/ClasspathTraderStoryEmbedder.java | 2 +-
.../org/jbehave/examples/trader/TraderStory.java | 3 +-
.../jbehave/examples/trader/TraderStoryRunner.java | 1 +
.../reporters/StoryReporterBuilderBehaviour.java | 12 ++--
.../java/org/jbehave/core/StoryConfiguration.java | 34 ++++++----
.../main/java/org/jbehave/core/StoryEmbedder.java | 4 +
.../java/org/jbehave/core/StoryRunnerMode.java | 66 +++++++++++++------
.../core/reporters/DelegatingStoryReporter.java | 6 ++
.../core/reporters/StoryReporterBuilder.java | 24 +++-----
10 files changed, 94 insertions(+), 118 deletions(-)
delete mode 100644 examples/trader/jbehave-reports/rendered/index.html
hooks/post-receive
--
jbehave-core
<hr/>
<p>
To unsubscribe from this list please visit:
</p>
<p>
<a
href="http://xircles.codehaus.org/manage_email";>http://xircles.codehaus.org/manage_email</a>
