Merge remote-tracking branch 'origin/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/14ddffdc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/14ddffdc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/14ddffdc
Branch: refs/heads/TINKERPOP-1682
Commit: 14ddffdc2b06b62ba8d99b29cb1ac854b90dd02f
Parents: c6c1777 e3552d9
Author: Stephen Mallette <[email protected]>
Authored: Mon Jun 12 11:37:53 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon Jun 12 11:37:53 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 15 +++++++++++++--
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 ++--
2 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/14ddffdc/CHANGELOG.asciidoc
----------------------------------------------------------------------
