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 2015/04/07 03:57:48 UTC
[4/4] incubator-streams-examples git commit: Merge commit
'96129f444677002c470ce5159245c7c5aea05884'
Merge commit '96129f444677002c470ce5159245c7c5aea05884'
* commit '96129f444677002c470ce5159245c7c5aea05884':
fixed delete verb def clean-up documentation confirmed working
refactored to use streams-filters for routing Deletes to PersistDeleter
basic implementation (untested)
Conflicts:
local/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/commit/8bde542e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/8bde542e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/8bde542e
Branch: refs/heads/master
Commit: 8bde542ec28879420828cb63203c1ab6ca482e12
Parents: 3e03677 96129f4
Author: Steve Blackmon <sb...@apache.org>
Authored: Mon Apr 6 20:46:06 2015 -0500
Committer: Steve Blackmon <sb...@apache.org>
Committed: Mon Apr 6 20:46:06 2015 -0500
----------------------------------------------------------------------
local/pom.xml | 1 +
.../twitter-userstream-elasticsearch/README.md | 72 +++++
.../TwitterUserstreamElasticsearch.png | Bin 0 -> 65713 bytes
local/twitter-userstream-elasticsearch/pom.xml | 288 +++++++++++++++++++
.../example/TwitterUserstreamElasticsearch.java | 142 +++++++++
.../twitter/TwitterUserstreamElasticsearch.json | 14 +
.../TwitterUserstreamElasticsearch.dot | 28 ++
.../src/main/resources/application.conf | 22 ++
8 files changed, 567 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/8bde542e/local/pom.xml
----------------------------------------------------------------------
diff --cc local/pom.xml
index b064a90,30e0206..31d1ccc
--- a/local/pom.xml
+++ b/local/pom.xml
@@@ -37,9 -37,8 +37,10 @@@
</properties>
<modules>
-
- <module>twitter-userstream-elasticsearch</module>
+ <module>elasticsearch-hdfs</module>
+ <module>elasticsearch-reindex</module>
+ <module>mongo-elasticsearch-sync</module>
++ <module>twitter-userstream-elasticsearch</module>
</modules>
</project>