Merge branch 'S4-127' into dev (take 2)
- second merge to include left-over modification in S4-127
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/faf0da42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/faf0da42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/faf0da42
Branch: refs/heads/master
Commit: faf0da4262aae184297fa5672375666d8e3e5283
Parents: 80fb90e a4b5eef
Author: Matthieu Morel <mmorel@apache.org>
Authored: Sun Mar 10 10:53:33 2013 +0100
Committer: Matthieu Morel <mmorel@apache.org>
Committed: Sun Mar 10 11:06:48 2013 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/tools/Status.java | 2 +-
.../test/java/org/apache/s4/tools/TestStatus.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
|