Merge branch 'tp32' into tp33 Conflicts: docs/src/tutorials/getting-started/index.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2862ff98 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2862ff98 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2862ff98 Branch: refs/heads/tp33 Commit: 2862ff989c810710583f3157a66cb9ef73f3d968 Parents: ae9d7f6 6feff18 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue May 29 12:53:22 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue May 29 12:53:22 2018 -0400 ---------------------------------------------------------------------- docs/src/dev/provider/index.asciidoc | 80 ++++++++++ .../src/reference/gremlin-applications.asciidoc | 5 +- .../reference/implementations-neo4j.asciidoc | 10 +- docs/src/reference/intro.asciidoc | 148 ++----------------- docs/src/reference/the-graph.asciidoc | 40 ++--- 5 files changed, 126 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/dev/provider/index.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/reference/implementations-neo4j.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/reference/the-graph.asciidoc ----------------------------------------------------------------------