This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch tp33 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 7394c7f58f3a7419f77c8bc8debeb384dd1217ff Merge: 077b144 ee225c3 Author: Stephen Mallette <[email protected]> AuthorDate: Tue Oct 16 06:26:04 2018 -0400 Merge remote-tracking branch 'origin/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.Template/Gremlin.Net.Template.csproj gremlin-dotnet/src/Gremlin.Net.Template/Gremlin.Net.Template.nuspec 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 CHANGELOG.asciidoc | 57 +++++++++++++++++++++- bin/validate-distribution.sh | 6 +-- docs/src/upgrade/release-3.2.x-incubating.asciidoc | 2 +- 3 files changed, 60 insertions(+), 5 deletions(-)
