storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [4/4] storm git commit: Merge branch 'STORM-637'
Date Mon, 09 Feb 2015 18:33:10 GMT
Merge branch 'STORM-637'

Conflicts:
	CHANGELOG.md


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

Branch: refs/heads/master
Commit: 8036109f68d77802cfd8c4a1e1bb14d4f9e9ff82
Parents: 15f99fd bb6f32d
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Authored: Mon Feb 9 12:32:46 2015 -0600
Committer: Robert (Bobby) Evans <evans@yahoo-inc.com>
Committed: Mon Feb 9 12:32:46 2015 -0600

----------------------------------------------------------------------
 CHANGELOG.md                                    |   1 +
 docs/documentation/Common-patterns.md           |  14 +-
 docs/documentation/Concepts.md                  |  13 +-
 .../storm/starter/SkewedRollingTopWords.java    | 134 +++++++++++++++++++
 .../storm/starter/bolt/RollingCountAggBolt.java |  78 +++++++++++
 .../coordination/BatchSubtopologyBuilder.java   |  11 ++
 .../storm/drpc/LinearDRPCInputDeclarer.java     |   5 +-
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |  13 +-
 .../storm/grouping/PartialKeyGrouping.java      |  31 ++++-
 .../backtype/storm/topology/InputDeclarer.java  |   3 +
 .../storm/topology/TopologyBuilder.java         |  11 ++
 .../TransactionalTopologyBuilder.java           |  13 +-
 .../topology/TridentTopologyBuilder.java        |  13 +-
 .../storm/grouping/PartialKeyGroupingTest.java  |  26 +++-
 14 files changed, 349 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/8036109f/CHANGELOG.md
----------------------------------------------------------------------
diff --cc CHANGELOG.md
index 433f33f,98959bb..d0e4a03
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -44,7 -44,7 +44,8 @@@
   * STORM-608: Storm UI CSRF escape characters not work correctly.
   * STORM-626: Add script to print out the merge command for a given pull request.
   * STORM-601: Make jira-github-join ignore case.
 + * STORM-667: Incorrect capitalization "SHell" in Multilang-protocol.md
+  * STORM-637: Integrate PartialKeyGrouping into storm API
  
  ## 0.9.3-rc2
   * STORM-558: change "swap!" to "reset!" to fix assignment-versions in supervisor


Mime
View raw message