Merge branch 'MLHR-1892' of https://github.com/amberarrow/incubator-apex-malhar into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/c31c5eab Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/c31c5eab Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/c31c5eab Branch: refs/heads/master Commit: c31c5eab317c4a85c689a854b8a7ec79c68386ed Parents: 41caa95 0e20503 Author: Thomas Weise <[email protected]> Authored: Mon Dec 14 11:17:48 2015 -0800 Committer: Thomas Weise <[email protected]> Committed: Mon Dec 14 11:17:48 2015 -0800 ---------------------------------------------------------------------- .../wordcount/ApplicationWithQuerySupport.java | 20 ++++ .../demos/wordcount/FileWordCount.java | 116 ++++++++++++++----- .../datatorrent/demos/wordcount/LineReader.java | 28 ++++- .../com/datatorrent/demos/wordcount/WCPair.java | 22 +++- .../demos/wordcount/WindowWordCount.java | 24 ++-- .../demos/wordcount/WordCountWriter.java | 24 +++- .../datatorrent/demos/wordcount/WordReader.java | 24 +++- 7 files changed, 207 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
