You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/07 20:03:30 UTC
[2/6] storm git commit: upmerge from master
upmerge from master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/122f0f47
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/122f0f47
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/122f0f47
Branch: refs/heads/master
Commit: 122f0f47e049f4ddcc0f6b511654f84403da9742
Parents: a23533c d42c437
Author: 卫乐 <we...@taobao.com>
Authored: Wed Mar 2 11:56:13 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Wed Mar 2 11:56:13 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 3 +
bin/storm.cmd | 2 +-
bin/storm.py | 4 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../apache/storm/command/upload_credentials.clj | 35 -----------
.../src/jvm/org/apache/storm/command/List.java | 50 ----------------
.../apache/storm/command/ListTopologies.java | 52 +++++++++++++++++
.../apache/storm/command/UploadCredentials.java | 61 ++++++++++++++++++++
8 files changed, 120 insertions(+), 89 deletions(-)
----------------------------------------------------------------------