Repository: incubator-streams Updated Branches: refs/heads/master 0c2db4a86 -> 849a2e8f9
Merge pull request #7 from apache/master apache master merge 2014/10/17 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2a635dfe Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2a635dfe Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2a635dfe Branch: refs/heads/master Commit: 2a635dfe87974076075494ff7d4833a3007c0af3 Parents: 4704012 0a32159 Author: Ryan Ebanks <[email protected]> Authored: Fri Oct 17 14:06:46 2014 -0500 Committer: Ryan Ebanks <[email protected]> Committed: Fri Oct 17 14:06:46 2014 -0500 ---------------------------------------------------------------------- .../elasticsearch/ElasticsearchQuery.java | 18 ++---- .../processor/PercolateTagProcessor.java | 64 ++++---------------- .../ElasticsearchReaderConfiguration.json | 5 ++ .../processor/PercolateTagProcessorTest.java | 46 ++++++++++++++ .../api/FacebookPostActivitySerializer.java | 2 +- .../serializer/util/InstagramActivityUtil.java | 5 +- .../test/InstagramActivitySerDeTest.java | 11 +--- 7 files changed, 73 insertions(+), 78 deletions(-) ----------------------------------------------------------------------
