Merge remote-tracking branch 'origin/tp31'
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/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/65e2a3e5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65e2a3e5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65e2a3e5
Branch: refs/heads/master
Commit: 65e2a3e5943535ec4a1ce16cee54933eaebfd81e
Parents: 8b3c291 b0d4c83
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 6 10:31:37 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 6 10:31:37 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65e2a3e5/CHANGELOG.asciidoc
----------------------------------------------------------------------
