Merge branch 'tp31'

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

Branch: refs/heads/TINKERPOP-1442-master
Commit: 204da4b432f33087df7ce0a70e7f2ed65cc13964
Parents: 8fc60ad 146f36f
Author: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Authored: Thu Sep 15 17:35:35 2016 +0200
Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com>
Committed: Thu Sep 15 17:35:35 2016 +0200

----------------------------------------------------------------------
 docs/src/dev/developer/contributing.asciidoc              |  4 ++--
 docs/src/reference/implementations-hadoop.asciidoc        |  2 +-
 docs/src/reference/implementations-tinkergraph.asciidoc   |  2 +-
 docs/src/reference/intro.asciidoc                         |  2 +-
 docs/src/reference/the-traversal.asciidoc                 | 10 +++++-----
 docs/src/upgrade/index.asciidoc                           |  2 +-
 .../tinkerpop/gremlin/process/computer/MapReduce.java     |  2 +-
 .../java/org/apache/tinkerpop/gremlin/driver/Cluster.java |  2 +-
 .../tinkerpop/gremlin/driver/LoadBalancingStrategy.java   |  2 +-
 .../gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java  |  2 +-
 .../tinkerpop/gremlin/server/AbstractChannelizer.java     |  2 +-
 .../process/computer/util/ComputerSubmissionHelper.java   |  2 +-
 .../tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java     |  2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/docs/src/reference/intro.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/docs/src/upgrade/index.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/MapReduce.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/204da4b4/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/util/ComputerSubmissionHelper.java
----------------------------------------------------------------------

Reply via email to