Merge remote-tracking branch 'origin/tp31'
Conflicts:
docs/src/dev/developer/administration.asciidoc
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/72ebad21
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/72ebad21
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/72ebad21
Branch: refs/heads/TINKERPOP-1280
Commit: 72ebad21dbbb41262e4ec6ebac833683e986c0e0
Parents: a1ba988 7fa75fd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 07:06:59 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 07:06:59 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 8 ++-
docs/src/dev/developer/administration.asciidoc | 43 +++++++++++++++-
docs/src/dev/developer/release.asciidoc | 52 ++++++++++++--------
.../upgrade/release-3.1.x-incubating.asciidoc | 5 ++
4 files changed, 86 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ebad21/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ebad21/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/dev/developer/release.asciidoc
index ae8e912,f9baa94..91e397a
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@@ -257,4 -266,5 +268,5 @@@ The Central Maven repo has sync'd as we
https://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/xx.yy.zz/
- [include the release line logo]
+ [include the release line logo image]
-----
++----
