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-web".
The branch, master has been updated
via cd8861a94df8bb4449b2cacf1998ae7a13ab4a8d (commit)
via 82b7f0cd1443824848640867c6af60bcd0b24c77 (commit)
from 16d9dce83610c0ea3710317617a29ac50aa83375 (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 cd8861a94df8bb4449b2cacf1998ae7a13ab4a8d
Merge: 82b7f0cd1443824848640867c6af60bcd0b24c77
16d9dce83610c0ea3710317617a29ac50aa83375
Author: Mauro Talevi <[email protected]>
Date: Tue Apr 13 00:15:19 2010 +0100
Merge branch 'master' of ssh://git.codehaus.org/jbehave-web
Conflicts:
web-runner/src/main/java/org/jbehave/web/runner/waffle/controllers/StoryController.java
web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerScenarioStepsTest.java
web-selenium/src/test/java/org/jbehave/web/selenium/SeleniumPerStoryStepsTest.java
commit 82b7f0cd1443824848640867c6af60bcd0b24c77
Author: Mauro Talevi <[email protected]>
Date: Tue Apr 13 00:08:26 2010 +0100
Updated web to core 3.0-beta-2.
-----------------------------------------------------------------------
Summary of changes:
pom.xml | 2 +-
.../runner/waffle/controllers/StoryController.java | 17 +++++++++--------
.../waffle/controllers/StoryControllerTest.java | 16 ++++++++--------
.../web/selenium/SeleniumPerScenarioStepsTest.java | 7 ++-----
.../web/selenium/SeleniumPerStoryStepsTest.java | 5 ++---
5 files changed, 22 insertions(+), 25 deletions(-)
hooks/post-receive
--
jbehave-web
<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>
