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/02 18:27:37 UTC

[4/9] 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/1c9b9504
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1c9b9504
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1c9b9504

Branch: refs/heads/master
Commit: 1c9b9504369594217532a18efb99bf4c5546efe0
Parents: a4d1ce4 9aa8bf0
Author: 卫乐 <we...@taobao.com>
Authored: Tue Mar 1 09:52:19 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Tue Mar 1 09:52:19 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   1 +
 README.markdown                                 |   4 +
 .../src/clj/org/apache/storm/daemon/acker.clj   | 108 ----------------
 .../src/clj/org/apache/storm/daemon/common.clj  |  17 ++-
 storm-core/src/clj/org/apache/storm/testing.clj |   7 +-
 .../src/jvm/org/apache/storm/daemon/Acker.java  | 128 +++++++++++++++++++
 .../src/jvm/org/apache/storm/utils/Utils.java   |   4 +
 7 files changed, 150 insertions(+), 119 deletions(-)
----------------------------------------------------------------------