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 e696ea0d41870f77c34c4c84120f85b9b712d97b (commit)
via 8ad88f27ea1f36959c072dd03aad79ea804fc174 (commit)
from 9f6d58c74bbbfebe13d717ebfce6f4c348e936ce (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 e696ea0d41870f77c34c4c84120f85b9b712d97b
Merge: 9f6d58c 8ad88f2
Author: Paul Hammant <[email protected]>
Date: Fri Dec 9 10:04:15 2011 -0800
Merge pull request #24 from ezilocchi/master
JBEHAVE-563: fixed - Perform a cancellation of those stories that exceed
the time out if it is setted.
commit 8ad88f27ea1f36959c072dd03aad79ea804fc174
Author: Emiliano Zilocchi <[email protected]>
Date: Tue Dec 6 09:57:41 2011 -0600
JBEHAVE-563: fixed
-----------------------------------------------------------------------
Summary of changes:
.../jbehave/examples/threads/ThreadsStories.java | 2 +-
.../examples/threads/steps/ThreadsSteps.java | 11 +--
.../java/org/jbehave/core/embedder/Embedder.java | 68 ++++++++++++-------
.../org/jbehave/core/embedder/StoryRunner.java | 21 +++++-
.../jbehave/core/embedder/EmbedderBehaviour.java | 69 ++++++++++++++++++++
.../core/embedder/StoryRunnerBehaviour.java | 40 +++++++++++
6 files changed, 173 insertions(+), 38 deletions(-)
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>
</p>