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/514cfdb6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/514cfdb6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/514cfdb6
Branch: refs/heads/master
Commit: 514cfdb62e2c44da853bbf170fd9d948dc48ae6b
Parents: 91e0010 89c936b
Author: Stephen Mallette <[email protected]>
Authored: Tue Jul 19 06:50:13 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Tue Jul 19 06:50:13 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 47 +++++++++++++++++++-
docs/src/dev/developer/release.asciidoc | 1 -
.../upgrade/release-3.1.x-incubating.asciidoc | 4 +-
3 files changed, 48 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/514cfdb6/CHANGELOG.asciidoc
----------------------------------------------------------------------
