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/66099fed Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/66099fed Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/66099fed Branch: refs/heads/master Commit: 66099fed82e57ef29d1983a5f95725dcd4e5c157 Parents: e55ffc6 dde73e4 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Jul 27 07:17:54 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Jul 27 07:17:54 2018 -0400 ---------------------------------------------------------------------- docs/src/dev/developer/for-committers.asciidoc | 2 +- docs/src/recipes/between-vertices.asciidoc | 6 +++--- docs/src/recipes/collections.asciidoc | 18 +++++++++--------- docs/src/recipes/pagination.asciidoc | 2 +- .../recipes/traversal-component-reuse.asciidoc | 4 ++-- docs/src/recipes/tree.asciidoc | 2 +- docs/src/reference/the-traversal.asciidoc | 2 +- docs/src/tutorials/getting-started/index.asciidoc | 10 +++++----- .../src/tutorials/gremlins-anatomy/index.asciidoc | 16 ++++++++-------- .../tutorials/the-gremlin-console/index.asciidoc | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66099fed/docs/src/dev/developer/for-committers.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66099fed/docs/src/recipes/collections.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66099fed/docs/src/reference/the-traversal.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/66099fed/docs/src/tutorials/getting-started/index.asciidoc ----------------------------------------------------------------------