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 <sp...@genoprime.com>
Authored: Fri May 11 16:51:33 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
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
----------------------------------------------------------------------
