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/c14aa30f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c14aa30f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c14aa30f
Branch: refs/heads/tp33
Commit: c14aa30fbaae5971bfb3a2bb24acb964c98e882f
Parents: 65f1529 93a6434
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 3 14:19:20 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 3 14:19:20 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c14aa30f/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
