[15/30] storm git commit: upmerge storm master

[bobby]

upmerge storm master


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/69f2906c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/69f2906c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/69f2906c

Branch: refs/heads/master
Commit: 69f2906c0748826101511b1dd6005f910ebfd5fc
Parents: faaacae 9aa8bf0
Author: 卫乐 <weiyue...@taobao.com>
Authored: Tue Mar 1 11:49:59 2016 +0800
Committer: 卫乐 <weiyue...@taobao.com>
Committed: Tue Mar 1 11:49:59 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   2 +
 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 +-
 .../storm/blobstore/LocalFsBlobStore.java       |   2 +-
 .../src/jvm/org/apache/storm/daemon/Acker.java  | 128 +++++++++++++++++++
 .../apache/storm/topology/TopologyBuilder.java  |  13 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |   4 +
 .../storm/topology/TopologyBuilderTest.java     |  65 ++++++++++
 10 files changed, 226 insertions(+), 124 deletions(-)
----------------------------------------------------------------------