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/f83350a4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f83350a4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f83350a4 Branch: refs/heads/TINKERPOP-1888 Commit: f83350a47d7b70e76b89a9062c95d07b30dd5956 Parents: c14aa30 2656b64 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Apr 6 20:44:26 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Apr 6 20:44:26 2018 -0400 ---------------------------------------------------------------------- gremlin-dotnet/glv/Gremlin.Net.csproj.template | 4 ++-- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f83350a4/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj ----------------------------------------------------------------------