Merge branch 'tp31' into 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-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/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/6d8e809f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6d8e809f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6d8e809f
Branch: refs/heads/TINKERPOP-1599
Commit: 6d8e809f85f65752a4afe0ee40af29eb3e71ac0b
Parents: fb7b1bb 2decc81
Author: Stephen Mallette <[email protected]>
Authored: Tue Feb 14 10:52:03 2017 -0500
Committer: Stephen Mallette <[email protected]>
Committed: Tue Feb 14 10:52:03 2017 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 10 ++++++++++
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 7 +++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6d8e809f/CHANGELOG.asciidoc
----------------------------------------------------------------------
