Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/04cdd75e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/04cdd75e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/04cdd75e Branch: refs/heads/master Commit: 04cdd75e3c313d9a4a5f16bdc6d04f671d569587 Parents: ab2fd2c c29e0f6 Author: florianhockmann <[email protected]> Authored: Wed Nov 1 19:36:30 2017 +0100 Committer: florianhockmann <[email protected]> Committed: Wed Nov 1 19:36:30 2017 +0100 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + docs/preprocessor/preprocess-file.sh | 2 +- docs/src/recipes/index.asciidoc | 2 + docs/src/recipes/olap-spark-yarn.asciidoc | 158 +++++++++++++++++++++++++ pom.xml | 1 + spark-gremlin/pom.xml | 7 +- 6 files changed, 168 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
