You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/06/20 20:37:48 UTC

[17/20] tinkerpop git commit: removed NOTE: Neo4jGraph currently does not support HA and added an image for the HA section. CTR.

removed NOTE: Neo4jGraph currently does not support HA and added an image for the HA section. CTR.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da26cf18
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da26cf18
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da26cf18

Branch: refs/heads/TINKERPOP-1278
Commit: da26cf1862b7827223205c5410731c96d3cca70a
Parents: b2cf6d8
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jun 17 07:33:37 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jun 17 07:33:37 2016 -0600

----------------------------------------------------------------------
 .../reference/implementations-neo4j.asciidoc    |     5 +-
 docs/static/images/neo4j-ha.png                 |   Bin 0 -> 108249 bytes
 docs/static/images/tinkerpop3.graffle           | 23433 ++++++++---------
 3 files changed, 11624 insertions(+), 11814 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da26cf18/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index 998eb74..d1fc30b 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -54,9 +54,6 @@ gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
 ==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
 ----
 
-NOTE: Neo4j link:http://docs.neo4j.org/chunked/stable/ha.html[High Availability] is currently not supported by
-Neo4j-Gremlin.
-
 TIP: To host Neo4j in <<gremlin-server,Gremlin Server>>, the dependencies must first be "installed" or otherwise
 copied to the Gremlin Server path. The automated method for doing this would be to execute
 `bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z`.
@@ -263,7 +260,7 @@ gremlin.neo4j.conf.relationship_auto_indexing=true
 High Availability Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-TinkerPop supports running Neo4j with its fault tolerant master-slave replication configuration, referred to as its
+image:neo4j-ha.png[width=400,float=right] TinkerPop supports running Neo4j with its fault tolerant master-slave replication configuration, referred to as its
 link:http://neo4j.com/docs/operations-manual/current/#_neo4j_cluster_install[High Availability (HA) cluster]. From the
 TinkerPop perspective, configuring for HA is not that different than configuring for embedded mode as shown above. The
 main difference is the usage of HA configuration options that enable the cluster. Once connected to a cluster, usage

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da26cf18/docs/static/images/neo4j-ha.png
----------------------------------------------------------------------
diff --git a/docs/static/images/neo4j-ha.png b/docs/static/images/neo4j-ha.png
new file mode 100644
index 0000000..b21393c
Binary files /dev/null and b/docs/static/images/neo4j-ha.png differ