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 04:11:24 UTC
[3/3] incubator-streams-examples git commit: Merge branch
'STREAMS-302'
Merge branch 'STREAMS-302'
* STREAMS-302:
cleanup documentation
initial implementation, working
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/a1836d0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/tree/a1836d0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/diff/a1836d0b
Branch: refs/heads/master
Commit: a1836d0b0be801e6c0c432c3878222a0cbd26376
Parents: d4dde22 146ab8d
Author: Steve Blackmon <sb...@apache.org>
Authored: Mon Apr 6 21:11:07 2015 -0500
Committer: Steve Blackmon <sb...@apache.org>
Committed: Mon Apr 6 21:11:07 2015 -0500
----------------------------------------------------------------------
local/pom.xml | 1 +
local/twitter-follow-graph/README.md | 97 ++++++
.../twitter-follow-graph/TwitterFollowGraph.png | Bin 0 -> 35826 bytes
local/twitter-follow-graph/pom.xml | 301 +++++++++++++++++++
.../example/graph/TwitterFollowGraph.java | 87 ++++++
.../TwitterFollowGraphConfiguration.json | 13 +
.../src/main/resources/TwitterFollowGraph.dot | 21 ++
7 files changed, 520 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams-examples/blob/a1836d0b/local/pom.xml
----------------------------------------------------------------------
diff --cc local/pom.xml
index 0733019,d9631b8..705a251
--- a/local/pom.xml
+++ b/local/pom.xml
@@@ -37,11 -37,9 +37,12 @@@
</properties>
<modules>
+ <module>elasticsearch-hdfs</module>
<module>elasticsearch-reindex</module>
<module>mongo-elasticsearch-sync</module>
- <module>twitter-following-neo4j</module>
++ <module>twitter-follow-graph</module>
+ <module>twitter-history-elasticsearch</module>
+ <module>twitter-userstream-elasticsearch</module>
</modules>
</project>