Merge branch 'master' into TINKERPOP-1332
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7dfd0ddc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7dfd0ddc Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7dfd0ddc Branch: refs/heads/TINKERPOP-1274 Commit: 7dfd0ddcd836aba34d2eec83bc2844cbc1d03c67 Parents: 090efe3 408755d Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Tue Jun 21 16:44:29 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Tue Jun 21 16:44:29 2016 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + bin/validate-distribution.sh | 9 +- docs/src/dev/developer/administration.asciidoc | 5 +- .../developer/development-environment.asciidoc | 4 +- docs/src/dev/provider/index.asciidoc | 67 + docs/src/recipes/centrality.asciidoc | 6 + .../reference/implementations-hadoop.asciidoc | 70 +- .../reference/implementations-neo4j.asciidoc | 77 +- docs/src/reference/the-traversal.asciidoc | 3 +- docs/static/images/neo4j-ha.png | Bin 0 -> 108249 bytes docs/static/images/tinkerpop3.graffle | 23433 ++++++++--------- .../gremlin/process/remote/RemoteGraph.java | 20 +- .../decoration/HaltedTraverserStrategy.java | 8 +- .../strategy/decoration/SubgraphStrategy.java | 40 +- .../driver/remote/DriverRemoteConnection.java | 3 +- .../op/traversal/TraversalOpProcessor.java | 21 +- .../process/traversal/step/map/OrderTest.java | 1 + .../decoration/SubgraphStrategyProcessTest.java | 22 + 18 files changed, 11866 insertions(+), 11925 deletions(-) ----------------------------------------------------------------------
