[7/7] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 8971741589337bb8d257d1cc3f6d54fe152832b2
Parents: 8963b38 b78c688
Author: Stephen Mallette 
Authored: Mon Sep 24 16:16:11 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 24 16:16:11 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/89717415/CHANGELOG.asciidoc
--

[7/7] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: fb14324fb47cdff98b07798da4a7fc957c7374e3
Parents: 20bc5a3 59fc032
Author: Stephen Mallette 
Authored: Wed Aug 22 16:24:08 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Aug 22 16:24:08 2018 -0400

--
 .../test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs   | 2 +-
 .../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java   | 6 --
 .../gremlin/server/op/traversal/TraversalOpProcessor.java  | 6 --
 .../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java   | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb14324f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb14324f/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
--

[7/7] tinkerpop git commit: Merge branch 'tp33'

[spmallette]

Merge branch '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
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
gremlin-tools/gremlin-coverage/pom.xml
gremlin-tools/gremlin-io-test/pom.xml
gremlin-tools/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml


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

Branch: refs/heads/master
Commit: e425f1a6eba019987615dfd10b6d21590c2e45ff
Parents: 757de48 68d39dc
Author: Stephen Mallette 
Authored: Fri May 11 16:51:33 2018 -0400
Committer: Stephen Mallette 
Committed: Fri May 11 16:51:33 2018 -0400

--
 CHANGELOG.asciidoc  | 10 +
 .../developer/development-environment.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   |  7 +++
 docs/src/upgrade/release-3.3.x.asciidoc |  7 +++
 gremlin-dotnet/pom.xml  | 17 +--
 gremlin-groovy/pom.xml  |  6 ---
 gremlin-javascript/pom.xml  | 47 
 gremlin-python/pom.xml  |  4 +-
 pom.xml | 19 +---
 9 files changed, 61 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e425f1a6/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e425f1a6/gremlin-dotnet/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e425f1a6/gremlin-groovy/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e425f1a6/gremlin-javascript/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e425f1a6/gremlin-python/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e425f1a6/pom.xml
--