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/7b2783f4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7b2783f4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7b2783f4 Branch: refs/heads/tp33 Commit: 7b2783f4acb7940c19464d758a28eaa00987ee4f Parents: ea59446 fde136b Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue May 8 12:03:52 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue May 8 12:03:52 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 17 ++++++++++++++++- docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b2783f4/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b2783f4/docs/src/upgrade/release-3.2.x-incubating.asciidoc ----------------------------------------------------------------------