You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/01/31 11:59:33 UTC
[2/4] git commit: Merge branch 'S4-40' into dev
Merge branch 'S4-40' into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/bac25cb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/bac25cb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/bac25cb7
Branch: refs/heads/dev
Commit: bac25cb7d0fe3cac203ef7c633da438b568b97e7
Parents: 200d3de 29a22ef
Author: Matthieu Morel <mm...@apache.org>
Authored: Tue Jan 31 12:33:53 2012 +0100
Committer: Matthieu Morel <mm...@apache.org>
Committed: Tue Jan 31 12:33:53 2012 +0100
----------------------------------------------------------------------
.../org/apache/s4/ft/CheckpointingCoordinator.java | 135 ++++++++++
.../src/main/java/org/apache/s4/ft/SafeKeeper.java | 208 +++++++++++----
.../main/java/org/apache/s4/ft/SaveStateTask.java | 27 ++-
.../main/java/org/apache/s4/ft/SerializeTask.java | 45 +++
.../java/org/apache/s4/processor/AbstractPE.java | 16 +-
.../main/java/org/apache/s4/util/MetricsName.java | 109 ++++----
.../test/java/org/apache/s4/ft/RecoveryTest.java | 6 +-
7 files changed, 425 insertions(+), 121 deletions(-)
----------------------------------------------------------------------