[09/10] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

[spmallette]

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/a3c69373
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a3c69373
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a3c69373

Branch: refs/heads/master
Commit: a3c69373e2b9623c4abfab0fefe97c092458b865
Parents: fbdfbc2 90e5af1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 22 09:58:00 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 22 09:58:00 2016 -0400

----------------------------------------------------------------------
 bin/validate-distribution.sh            | 10 +++++-----
 docs/src/dev/developer/release.asciidoc | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------