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

Branch: refs/heads/master
Commit: fa6f51887307a1b2787632b1df0cebe6cdf9dfa0
Parents: 720be4c e4e629f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Oct 16 16:30:29 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun Oct 16 16:30:29 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              | 21 ++++++++++++++++++--
 .../upgrade/release-3.1.x-incubating.asciidoc   |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa6f5188/CHANGELOG.asciidoc
----------------------------------------------------------------------

Reply via email to