incubator-s4-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dfe...@apache.org
Subject [4/4] git commit: Merge branch 'S4-86' into dev
Date Tue, 05 Mar 2013 10:40:13 GMT
Updated Branches:
  refs/heads/dev 755ed6bc4 -> 457844d28


Merge branch 'S4-86' 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/457844d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/457844d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/457844d2

Branch: refs/heads/dev
Commit: 457844d283b722da69ae23d22162afcae2a6bc84
Parents: 755ed6b d6b89c3
Author: Daniel Gómez Ferro <dgomezferro@gmail.com>
Authored: Tue Mar 5 11:34:43 2013 +0100
Committer: Daniel Gómez Ferro <dgomezferro@gmail.com>
Committed: Tue Mar 5 11:34:43 2013 +0100

----------------------------------------------------------------------
 .gitignore                                         |    1 -
 .../src/main/java/org/apache/s4/core/App.java      |   12 +-
 .../java/org/apache/s4/core/ProcessingElement.java |   18 ++-
 .../java/org/apache/s4/core/util/S4Metrics.java    |   43 +++++
 website/Rules                                      |    3 +
 website/compass/config.rb                          |    1 +
 website/content/doc/0.6.0/event_dispatch.md        |  123 +++++++++++---
 website/content/doc/0.6.0/fault_tolerance.md       |   24 ++-
 website/content/doc/0.6.0/overview.md              |   32 ++--
 website/content/doc/0.6.0/walkthrough.md           |  130 +++++++++------
 website/content/images/doc/0.6.0/executors.png     |  Bin 0 -> 58130 bytes
 .../content/images/doc/0.6.0/sources/executors.odg |  Bin 0 -> 11631 bytes
 .../content/images/doc/0.6.0/sources/queues.odg    |  Bin 0 -> 10686 bytes
 website/content/style/coderay.scss                 |  119 +++++++++++++
 website/content/style/partials/_base.scss          |    1 +
 website/content/style/pygmentize.scss              |   76 +++++++++
 website/content/style/style.scss                   |    5 +-
 website/layouts/default.haml                       |    2 +
 18 files changed, 468 insertions(+), 122 deletions(-)
----------------------------------------------------------------------



Mime
View raw message