You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/07/16 04:02:10 UTC
[18/18] git commit: Merge branch 'STREAMS-134' of
https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-134
Merge branch 'STREAMS-134' of https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-134
Conflicts:
streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/PercolateProcessor.java
streams-contrib/streams-persist-elasticsearch/src/main/jsonschema/org/apache/streams/elasticsearch/ElasticsearchWriterConfiguration.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2f1bc422
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2f1bc422
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2f1bc422
Branch: refs/heads/STREAMS-134
Commit: 2f1bc422612d3d6030a48bd956ba9b0c1994855c
Parents: 7df265f 4e9a2bb
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Tue Jul 15 21:00:11 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Tue Jul 15 21:00:11 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------