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/02/24 17:17:35 UTC

[25/27] storm git commit: Merge branch 'master' into ClusterUtils

Merge branch 'master' into ClusterUtils


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

Branch: refs/heads/master
Commit: 0af6799411c747a6c900438ded222b7d757c7961
Parents: b09e275 11232b5
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Wed Feb 24 11:20:00 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Wed Feb 24 11:20:00 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   4 +-
 README.markdown                                 |   3 +-
 .../org/apache/storm/kafka/IntSerializer.java   |  10 +-
 .../src/jvm/org/apache/storm/utils/Time.java    |   1 +
 .../src/jvm/org/apache/storm/utils/Utils.java   |  17 +-
 .../test/clj/org/apache/storm/utils_test.clj    | 111 ----------
 .../jvm/org/apache/storm/utils/TimeTest.java    | 112 ++++++++++
 .../jvm/org/apache/storm/utils/UtilsTest.java   | 219 +++++++++++++++++++
 8 files changed, 353 insertions(+), 124 deletions(-)
----------------------------------------------------------------------