You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/04/14 06:19:27 UTC

[2/2] storm git commit: Merge branch 'pr-2068-1.x-merge' into 1.x-branch

Merge branch 'pr-2068-1.x-merge' into 1.x-branch


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/04dc8460
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/04dc8460
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/04dc8460

Branch: refs/heads/1.x-branch
Commit: 04dc846080708cc202a06c51875a51bff4552369
Parents: 07c68d5 6f79c1b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 15:16:57 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 15:16:57 2017 +0900

----------------------------------------------------------------------
 docs/State-checkpointing.md  |  81 ++++++------
 docs/Trident-API-Overview.md |   6 +-
 docs/storm-cassandra.md      |  21 ++--
 docs/storm-jdbc.md           |   7 +-
 docs/storm-kafka-client.md   |  15 ++-
 docs/storm-kafka.md          | 258 ++++++++++++++++++++------------------
 docs/storm-kinesis.md        |   3 +
 docs/storm-redis.md          |  61 +++++++--
 docs/storm-solr.md           |  18 ++-
 9 files changed, 272 insertions(+), 198 deletions(-)
----------------------------------------------------------------------