[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d9ccefce

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c10bde33 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c10bde33 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8b4f86f0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8b4f86f0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f37b2ef Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f37b2ef Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/61504992 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/61504992 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/90e39f06 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/90e39f06 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef20b764 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef20b764 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/957347fe Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/957347fe Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84777d4a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84777d4a Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/09627139 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/09627139 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4970a4c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4970a4c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/98ab1b05 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/98ab1b05 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ca69985 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ca69985 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b46c295c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b46c295c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-server/src/main/bin/gremlin-server.bat Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a050b6ed Tree:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5e48acce Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5e48acce Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2cf551f0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2cf551f0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b779a2a3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b779a2a3 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8af78372 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8af78372 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c49c0ccb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c49c0ccb Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ddc66941 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ddc66941 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-server/src/main/bin/gremlin-server.sh Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/88b6e143 Tree:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/79851067 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/79851067 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ffb8c3e4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffb8c3e4 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-test/features/map/Select.feature Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/445a8bf0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/445a8bf0

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5eaf312c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5eaf312c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1bd35dcc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1bd35dcc Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/421839d2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/421839d2 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ebee26c4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ebee26c4 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1ca5ef3d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1ca5ef3d Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/05432a79 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05432a79 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/398ab9c9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/398ab9c9 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8bf7a76f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8bf7a76f Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/53784f99 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/53784f99 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a6ba2d5b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a6ba2d5b Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f15781a

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/65ba04f1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65ba04f1 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b87a555f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b87a555f Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1309777d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1309777d Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e1ef8b62 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1ef8b62 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d71dc1c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d71dc1c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ab9d1054 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ab9d1054 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: docs/src/reference/gremlin-applications.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c790459d Tree:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/55fcbdc4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/55fcbdc4 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d7b756b1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7b756b1 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ee65d5f2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ee65d5f2 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/00f77fad Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00f77fad Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/04969222 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/04969222 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

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:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java Project:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e04f2630 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e04f2630 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef2cd572 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef2cd572 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5171afd9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5171afd9 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0b282e47 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0b282e47 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42e509c3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42e509c3 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81ea06a0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81ea06a0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: docs/src/dev/developer/release.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/044cd1f4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/044cd1f4

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eb79f398 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb79f398 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b63e2f96 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b63e2f96 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa5e7aff Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa5e7aff Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4e3a0a9b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4e3a0a9b Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/153a01b0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/153a01b0 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c7ece36e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c7ece36e Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/edaabb44 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edaabb44 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e1cffe3d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1cffe3d Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ad256743 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ad256743 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8005cb3e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8005cb3e Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ead56590 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ead56590 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81add608 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81add608 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cf6f9746 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cf6f9746 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0c9afb61 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0c9afb61 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f085146 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f085146 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aa40dfa6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa40dfa6 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: giraph-gremlin/pom.xml gremlin-archetype/gremlin-archetype-dsl/pom.xml gremlin-archetype/gremlin-archetype-server/pom.xml gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml gremlin-archetype/pom.xml

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eb351775 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb351775 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/58691c68 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/58691c68 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/177aeac9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/177aeac9 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/38bcdb6c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/38bcdb6c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4d13ab18 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4d13ab18 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-console/src/main/static/NOTICE gremlin-server/src/main/static/NOTICE Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/764e888f Tree:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: data/tinkerpop-sink.json gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed.json

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4274bd5c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4274bd5c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9f3d4fc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9f3d4fc Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c0078326 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c0078326 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dd3a54ec Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dd3a54ec Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/812439f5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/812439f5 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eb6b1e54 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb6b1e54 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/920a3d96 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/920a3d96 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31762f7c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31762f7c Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e56823b6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e56823b6 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-python/src/main/jython/radish/feature_steps.py Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/92e899f4 Tree:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9eed217f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9eed217f Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b516a6a5 Tree:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/032124a5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032124a5 Diff:

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

Merge branch 'tp32' into tp33 Conflicts: docs/src/dev/developer/for-committers.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/69a355f8 Tree: