Merge remote-tracking branch 'origin/tp31'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c573311
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c573311
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c573311
Branch: refs/heads/TINKERPOP-1280
Commit: 2c5733111b2c60b2e17d7ccd1fd83fff727335d4
Parents: 1aa52f0 e0de46e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 13:42:03 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 13:42:03 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
appveyor.yml | 14 -----------
docs/src/dev/developer/contributing.asciidoc | 2 +-
docs/src/dev/developer/for-committers.asciidoc | 13 +++-------
pom.xml | 1 -
spark-gremlin/pom.xml | 27 ---------------------
6 files changed, 6 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c573311/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c573311/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c573311/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c573311/spark-gremlin/pom.xml
----------------------------------------------------------------------
