Merge remote-tracking branch 'upstream/master' into Storm-456
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d42d8dab Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d42d8dab Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d42d8dab Branch: refs/heads/master Commit: d42d8dab3a7e5524f96ed1e9985381ca2936544e Parents: 16b7382 66be747 Author: Parth Brahmbhatt <[email protected]> Authored: Tue Dec 23 12:19:58 2014 -0800 Committer: Parth Brahmbhatt <[email protected]> Committed: Tue Dec 23 12:19:58 2014 -0800 ---------------------------------------------------------------------- CHANGELOG.md | 4 + DEVELOPER.md | 5 +- README.markdown | 18 ++-- 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 +- .../FieldNameBasedTupleToKafkaMapper.java | 2 +- .../src/clj/backtype/storm/daemon/logviewer.clj | 9 +- .../clj/backtype/storm/daemon/supervisor.clj | 18 ++-- storm-core/src/clj/backtype/storm/ui/core.clj | 1 + storm-core/src/jvm/backtype/storm/Config.java | 6 ++ 36 files changed, 239 insertions(+), 221 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/d42d8dab/storm-core/src/clj/backtype/storm/ui/core.clj ----------------------------------------------------------------------
