You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/08/14 20:01:20 UTC

[04/12] storm git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: 85eadd790198a506a020fb4d1fd3247741b7db64
Parents: e71e2dd 9b2fd72
Author: Arun Mahadevan <ai...@hortonworks.com>
Authored: Fri Jul 24 09:09:51 2015 +0530
Committer: Arun Mahadevan <ai...@hortonworks.com>
Committed: Fri Jul 24 09:09:51 2015 +0530

----------------------------------------------------------------------
 CHANGELOG.md                                    |  1 +
 .../src/clj/backtype/storm/daemon/task.clj      |  1 -
 storm-core/src/clj/backtype/storm/tuple.clj     |  6 ++-
 .../storm/grouping/PartialKeyGrouping.java      | 27 +++++++++++-
 .../storm/testing/TestWordBytesCounter.java     | 27 ++++++++++++
 .../backtype/storm/testing/TestWordCounter.java |  6 ++-
 .../test/clj/backtype/storm/grouping_test.clj   | 43 +++++++++++++-------
 7 files changed, 91 insertions(+), 20 deletions(-)
----------------------------------------------------------------------