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/017360bd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/017360bd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/017360bd Branch: refs/heads/master Commit: 017360bdeeccd907d86b36e686f1379d2907ce97 Parents: e157edb 8491151 Author: Parth Brahmbhatt <[email protected]> Authored: Tue Feb 3 15:22:35 2015 -0800 Committer: Parth Brahmbhatt <[email protected]> Committed: Tue Feb 3 15:22:35 2015 -0800 ---------------------------------------------------------------------- .gitignore | 1 + CHANGELOG.md | 21 +- README.markdown | 6 + SECURITY.md | 14 +- STORM-UI-REST-API.md | 21 + bin/storm | 36 +- bin/storm-config.cmd | 32 +- bin/storm.cmd | 15 +- conf/defaults.yaml | 3 +- docs/README.md | 9 + docs/documentation/Contributing-to-Storm.md | 2 +- docs/documentation/Home.md | 2 +- docs/documentation/Powered-By.md | 15 +- docs/downloads.html | 3 + .../hbase/trident/state/HBaseMapState.java | 2 +- .../storm/hbase/trident/state/HBaseState.java | 2 +- external/storm-kafka/README.md | 24 +- external/storm-kafka/pom.xml | 21 +- .../ExponentialBackoffMsgRetryManager.java | 167 ++++ .../jvm/storm/kafka/FailedMsgRetryManager.java | 26 + .../src/jvm/storm/kafka/PartitionManager.java | 42 +- .../src/jvm/storm/kafka/SpoutConfig.java | 8 + .../ExponentialBackoffMsgRetryManagerTest.java | 194 ++++ pom.xml | 19 +- storm-buildtools/storm-maven-plugins/pom.xml | 81 ++ .../storm/maven/plugin/util/CommandExec.java | 89 ++ .../plugin/versioninfo/VersionInfoMojo.java | 304 ++++++ storm-core/pom.xml | 41 +- storm-core/src/clj/backtype/storm/cluster.clj | 38 +- .../src/clj/backtype/storm/daemon/logviewer.clj | 5 +- .../src/clj/backtype/storm/daemon/nimbus.clj | 37 +- .../clj/backtype/storm/daemon/supervisor.clj | 5 +- .../src/clj/backtype/storm/daemon/worker.clj | 6 +- storm-core/src/clj/backtype/storm/ui/core.clj | 49 +- storm-core/src/clj/backtype/storm/util.clj | 11 +- storm-core/src/jvm/backtype/storm/Config.java | 6 + .../storm/generated/GetInfoOptions.java | 350 +++++++ .../jvm/backtype/storm/generated/Nimbus.java | 974 +++++++++++++++++++ .../storm/generated/NumErrorsChoice.java | 64 ++ .../storm/grouping/PartialKeyGrouping.java | 57 ++ .../backtype/storm/messaging/netty/Server.java | 2 + .../src/jvm/backtype/storm/utils/Monitor.java | 8 +- .../jvm/backtype/storm/utils/VersionInfo.java | 131 +++ storm-core/src/py/storm/DistributedRPC-remote | 0 .../py/storm/DistributedRPCInvocations-remote | 0 storm-core/src/py/storm/Nimbus-remote | 7 + storm-core/src/py/storm/Nimbus.py | 226 +++++ storm-core/src/py/storm/ttypes.py | 80 ++ .../storm-core-version-info.properties | 24 + storm-core/src/storm.thrift | 11 + .../templates/topology-page-template.html | 8 +- .../clj/backtype/storm/integration_test.clj | 10 +- .../scheduler/multitenant_scheduler_test.clj | 2 + .../test/clj/backtype/storm/supervisor_test.clj | 34 +- .../storm/grouping/PartialKeyGroupingTest.java | 46 + storm-dist/binary/src/main/assembly/binary.xml | 7 - 56 files changed, 3249 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/017360bd/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/017360bd/storm-dist/binary/src/main/assembly/binary.xml ----------------------------------------------------------------------
