Merge branch 'tp32'
Conflicts:
giraph-gremlin/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-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
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/1c0f6394
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c0f6394
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c0f6394
Branch: refs/heads/master
Commit: 1c0f63947e7daa2fc76290089f55279ce18bc1fa
Parents: 38c664d ecdccb4
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Oct 20 18:59:18 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Oct 20 18:59:18 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 +++++++
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 8 ++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c0f6394/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c0f6394/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
