You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/02/23 23:21:57 UTC

[02/21] storm git commit: Merge remote-tracking branch 'upstream/master' into STORM-616

Merge remote-tracking branch 'upstream/master' into STORM-616


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

Branch: refs/heads/master
Commit: ab9f778ae50a1e224ebdcc58e6249009fc1f91cc
Parents: 5b16016 ab76e67
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Mon Jan 5 22:23:52 2015 -0500
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Mon Jan 5 22:23:52 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.md                                    |   8 +
 DEVELOPER.md                                    |   5 +-
 README.markdown                                 |  18 +-
 STORM-UI-REST-API.md                            | 186 ++++++++++++-------
 bin/storm                                       |  59 +++---
 conf/defaults.yaml                              |   1 +
 docs/about/integrates.md                        |   2 +-
 docs/about/multi-language.md                    |   6 +-
 docs/about/simple-api.md                        |   2 +-
 .../Acking-framework-implementation.md          |   8 +-
 docs/documentation/Clojure-DSL.md               |   6 +-
 docs/documentation/Common-patterns.md           |   2 +-
 docs/documentation/Configuration.md             |   4 +-
 .../Creating-a-new-Storm-project.md             |   6 +-
 .../DSLs-and-multilang-adapters.md              |   3 +-
 ...Defining-a-non-jvm-language-dsl-for-storm.md |   2 +-
 docs/documentation/Distributed-RPC.md           |   2 +-
 docs/documentation/FAQ.md                       |   4 +-
 docs/documentation/Kestrel-and-Storm.md         |   2 +-
 docs/documentation/Lifecycle-of-a-topology.md   |  70 +++----
 docs/documentation/Maven.md                     |  50 +----
 docs/documentation/Multilang-protocol.md        |  30 ++-
 .../Serialization-(prior-to-0.6.0).md           |   2 +-
 .../documentation/Setting-up-a-Storm-cluster.md |   4 +-
 .../Setting-up-development-environment.md       |   2 +-
 docs/documentation/Structure-of-the-codebase.md |  88 ++++-----
 docs/documentation/Transactional-topologies.md  |  12 +-
 docs/documentation/Trident-API-Overview.md      |   4 +-
 docs/documentation/Trident-spouts.md            |   8 +-
 docs/documentation/Trident-state.md             |  12 +-
 docs/documentation/Tutorial.md                  |   4 +-
 docs/downloads.html                             |   2 +-
 .../storm/hdfs/bolt/format/SequenceFormat.java  |   5 +-
 external/storm-kafka/README.md                  |   2 +-
 .../FieldNameBasedTupleToKafkaMapper.java       |   2 +-
 logback/cluster.xml                             |   2 +-
 .../src/clj/backtype/storm/daemon/executor.clj  |   2 +-
 .../src/clj/backtype/storm/daemon/logviewer.clj |   9 +-
 .../clj/backtype/storm/daemon/supervisor.clj    |  18 +-
 .../src/clj/backtype/storm/messaging/loader.clj |   3 +-
 storm-core/src/clj/backtype/storm/ui/core.clj   |   1 +
 storm-core/src/jvm/backtype/storm/Config.java   |   6 +
 storm-core/src/ui/public/component.html         |   2 +-
 43 files changed, 373 insertions(+), 293 deletions(-)
----------------------------------------------------------------------