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 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-test/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 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/6b172738 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6b172738 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6b172738 Branch: refs/heads/TINKERPOP-1888 Commit: 6b172738e72aa4d337d7b3562404e741cb7e8666 Parents: d40d60a 004e721 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Apr 3 13:05:37 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Apr 3 13:05:37 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 51 +++++++++++++++++++- .../upgrade/release-3.2.x-incubating.asciidoc | 2 +- .../src/Gremlin.Net/Gremlin.Net.csproj | 4 +- 3 files changed, 53 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b172738/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj ----------------------------------------------------------------------