You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/31 21:10:40 UTC

[21/40] incubator-tinkerpop git commit: Merge branch 'docker' into tp31

Merge branch 'docker' into tp31


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/91d387af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/91d387af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/91d387af

Branch: refs/heads/TINKERPOP-1225
Commit: 91d387af1cb06073d6f7d5ea531caed9603c43fe
Parents: 733a332 fa6da7e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Mar 30 15:30:15 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Mar 30 15:30:15 2016 +0200

----------------------------------------------------------------------
 .dockerignore                                | 13 ++++
 CHANGELOG.asciidoc                           |  1 +
 docker/Dockerfile                            | 42 +++++++++++
 docker/build-containers.sh                   | 61 ++++++++++++++++
 docker/build.sh                              | 49 +++++++++++++
 docker/build/Dockerfile.template             | 22 ++++++
 docker/hadoop/Dockerfile.template            | 25 +++++++
 docker/hadoop/install.sh                     | 37 ++++++++++
 docker/hadoop/resources/core-site.xml        |  8 +++
 docker/hadoop/resources/hdfs-site.xml        |  8 +++
 docker/hadoop/resources/mapred-site.xml      | 24 +++++++
 docker/hadoop/resources/yarn-site.xml        | 16 +++++
 docker/resources/groovy/grapeConfig.xml      | 16 +++++
 docker/scripts/build.sh                      | 87 +++++++++++++++++++++++
 docs/src/dev/developer/contributing.asciidoc | 24 +++++++
 docs/src/dev/developer/index.asciidoc        |  2 +-
 pom.xml                                      |  1 +
 17 files changed, 435 insertions(+), 1 deletion(-)
----------------------------------------------------------------------