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 2016/08/23 08:03:04 UTC
[8/9] storm git commit: Merge branch 'STORM-2016-1.x' into 1.x-branch
Merge branch 'STORM-2016-1.x' 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/df8346ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/df8346ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/df8346ce
Branch: refs/heads/1.x-branch
Commit: df8346ce1a61ccad2a0c3f715b6c3a53bdaf5670
Parents: 7ef2fdd 0b9a4d0
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Aug 23 17:02:23 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Aug 23 17:02:23 2016 +0900
----------------------------------------------------------------------
bin/storm.py | 114 +-
docs/Command-line-client.md | 28 +-
external/storm-submit-tools/pom.xml | 201 +++
.../submit/command/DependencyResolverMain.java | 105 ++
.../storm/submit/dependency/AetherUtils.java | 81 ++
.../apache/storm/submit/dependency/Booter.java | 63 +
.../submit/dependency/DependencyResolver.java | 70 +
.../dependency/RepositorySystemFactory.java | 66 +
.../submit/dependency/AetherUtilsTest.java | 102 ++
.../dependency/DependencyResolverTest.java | 78 ++
pom.xml | 5 +
storm-core/src/clj/org/apache/storm/config.clj | 7 +-
.../src/clj/org/apache/storm/daemon/common.clj | 6 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 14 +-
.../clj/org/apache/storm/daemon/supervisor.clj | 65 +-
.../jvm/org/apache/storm/StormSubmitter.java | 102 +-
.../apache/storm/blobstore/BlobStoreUtils.java | 19 +
.../dependency/DependencyPropertiesParser.java | 61 +
.../storm/dependency/DependencyUploader.java | 166 +++
.../dependency/FileNotAvailableException.java | 33 +
.../org/apache/storm/generated/Assignment.java | 244 ++--
.../org/apache/storm/generated/BoltStats.java | 406 +++---
.../apache/storm/generated/ClusterSummary.java | 108 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 52 +-
.../storm/generated/ComponentPageInfo.java | 220 +--
.../org/apache/storm/generated/Credentials.java | 44 +-
.../apache/storm/generated/ExecutorStats.java | 168 +--
.../jvm/org/apache/storm/generated/HBNodes.java | 32 +-
.../org/apache/storm/generated/HBRecords.java | 36 +-
.../storm/generated/LSApprovedWorkers.java | 44 +-
.../generated/LSSupervisorAssignments.java | 48 +-
.../apache/storm/generated/LSTopoHistory.java | 64 +-
.../storm/generated/LSTopoHistoryList.java | 36 +-
.../storm/generated/LSWorkerHeartbeat.java | 36 +-
.../apache/storm/generated/ListBlobsResult.java | 32 +-
.../apache/storm/generated/LocalAssignment.java | 36 +-
.../apache/storm/generated/LocalStateData.java | 48 +-
.../org/apache/storm/generated/LogConfig.java | 48 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 36 +-
.../org/apache/storm/generated/NodeInfo.java | 32 +-
.../storm/generated/RebalanceOptions.java | 44 +-
.../storm/generated/SettableBlobMeta.java | 36 +-
.../org/apache/storm/generated/SpoutStats.java | 252 ++--
.../org/apache/storm/generated/StormBase.java | 92 +-
.../apache/storm/generated/StormTopology.java | 428 +++++-
.../apache/storm/generated/SupervisorInfo.java | 152 +-
.../storm/generated/SupervisorPageInfo.java | 76 +-
.../storm/generated/SupervisorSummary.java | 44 +-
.../storm/generated/TopologyHistoryInfo.java | 32 +-
.../apache/storm/generated/TopologyInfo.java | 160 +--
.../storm/generated/TopologyPageInfo.java | 132 +-
.../apache/storm/generated/TopologyStats.java | 220 +--
.../apache/storm/utils/ThriftTopologyUtils.java | 4 +
storm-core/src/py/storm/Nimbus.py | 14 +-
storm-core/src/py/storm/ttypes.py | 1302 +++++++++---------
storm-core/src/storm.thrift | 12 +-
.../test/clj/org/apache/storm/nimbus_test.clj | 7 +-
.../clj/org/apache/storm/supervisor_test.clj | 16 +-
.../DependencyPropertiesParserTest.java | 72 +
.../dependency/DependencyUploaderTest.java | 297 ++++
.../storm/utils/ThriftTopologyUtilsTest.java | 12 +
storm-dist/binary/src/main/assembly/binary.xml | 7 +
62 files changed, 4308 insertions(+), 2259 deletions(-)
----------------------------------------------------------------------