You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/11/23 22:07:46 UTC
[07/37] storm git commit: Merge remote-tracking branch 'asf/master'
into STORM-855
Merge remote-tracking branch 'asf/master' into STORM-855
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7f9d00db
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7f9d00db
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7f9d00db
Branch: refs/heads/master
Commit: 7f9d00dba940addb854f7f7f765cb711102857e0
Parents: 444ec05 ffb5d03
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Fri Oct 30 17:31:13 2015 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Fri Oct 30 17:31:13 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 2 +
STORM-UI-REST-API.md | 19 +-
conf/defaults.yaml | 2 +
.../storm/starter/FastWordCountTopology.java | 11 +-
.../src/clj/backtype/storm/daemon/executor.clj | 104 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 26 +-
.../src/clj/backtype/storm/daemon/task.clj | 10 +-
.../src/clj/backtype/storm/daemon/worker.clj | 12 +-
storm-core/src/clj/backtype/storm/disruptor.clj | 25 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 16 +-
storm-core/src/jvm/backtype/storm/Config.java | 18 +
.../backtype/storm/generated/TopologyInfo.java | 602 ++++++++-
.../storm/generated/TopologyPageInfo.java | 604 ++++++++-
.../storm/generated/TopologySummary.java | 604 ++++++++-
.../jvm/backtype/storm/scheduler/Cluster.java | 16 +-
.../storm/scheduler/TopologyDetails.java | 51 +
.../resource/ResourceAwareScheduler.java | 38 +-
.../backtype/storm/utils/DisruptorQueue.java | 411 ++++---
storm-core/src/py/storm/ttypes.py | 1145 +++++++++++++++---
storm-core/src/storm.thrift | 18 +
storm-core/src/ui/public/index.html | 6 +-
.../public/templates/index-page-template.html | 18 +-
.../templates/topology-page-template.html | 60 +
storm-core/src/ui/public/topology.html | 8 +
.../scheduler/resource_aware_scheduler_test.clj | 38 +-
.../utils/DisruptorQueueBackpressureTest.java | 11 +-
.../storm/utils/DisruptorQueueTest.java | 57 +-
27 files changed, 3343 insertions(+), 589 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/conf/defaults.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/clj/backtype/storm/daemon/worker.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/jvm/backtype/storm/generated/TopologyInfo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/jvm/backtype/storm/generated/TopologySummary.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/py/storm/ttypes.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f9d00db/storm-core/src/storm.thrift
----------------------------------------------------------------------