You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/05/28 04:21:29 UTC

[24/44] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9fd773ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9fd773ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9fd773ec

Branch: refs/heads/master
Commit: 9fd773ec310654690b221834d5acb3fd39e0d6ee
Parents: 1358c65 466248a
Author: Steve Loughran <st...@apache.org>
Authored: Fri May 23 18:48:01 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri May 23 18:48:01 2014 +0100

----------------------------------------------------------------------
 LICENSE.TXT                                     | 305 -------------
 LICENSE.txt                                     | 423 +++++++++++++++++++
 NOTICE.txt                                      |  19 +-
 src/site/markdown/architecture/index.md         |  27 +-
 src/site/markdown/developing/index.md           |  27 +-
 src/site/markdown/index.md                      |  25 +-
 .../markdown/registry/p2p_service_registries.md |  25 +-
 src/site/markdown/registry/references.md        |  27 +-
 src/site/site.xml                               |  25 +-
 src/test/clusters/configs.md                    |  27 +-
 src/test/clusters/local/README.md               |  27 +-
 src/test/clusters/local/capacity-scheduler.xml  |  21 +-
 src/test/clusters/local/core-site.xml           |  21 +-
 src/test/clusters/local/hadoop-env.sh           |   2 -
 src/test/clusters/local/hadoop-policy.xml       |   3 -
 src/test/clusters/local/hbase/hbase-env.sh      |  33 +-
 src/test/clusters/local/hdfs-site.xml           |  23 +-
 src/test/clusters/local/httpfs-env.sh           |  27 +-
 src/test/clusters/local/httpfs-log4j.properties |  16 +-
 src/test/clusters/local/httpfs-site.xml         |  21 +-
 src/test/clusters/local/log4j.properties        |   2 -
 src/test/clusters/local/mapred-site.xml         |  21 +-
 src/test/clusters/local/yarn-site.xml           |  21 +-
 src/test/clusters/offline/hbase/hbase-env.sh    |  33 +-
 src/test/clusters/offline/readme.md             |  27 +-
 .../clusters/offline/slider/slider-client.xml   |  27 +-
 .../clusters/remote/slider/slider-client.xml    |  27 +-
 src/test/clusters/sandbox/README.md             |  27 +-
 .../clusters/sandbox/conf/hadoop-policy.xml     |   3 -
 src/test/clusters/sandbox/conf/log4j.properties |   2 -
 .../sandbox/conf/mapred-site.xml.template       |  21 +-
 src/test/clusters/sandbox/hbase/hbase-env.sh    |  33 +-
 src/test/clusters/sandbox/operations.md         |  27 +-
 .../clusters/sandbox/slider/slider-client.xml   |  27 +-
 src/test/clusters/script.md                     |  27 +-
 src/test/clusters/ubuntu-secure/README.md       |  27 +-
 .../ubuntu-secure/capacity-scheduler.xml        |  21 +-
 src/test/clusters/ubuntu-secure/core-site.xml   |  21 +-
 src/test/clusters/ubuntu-secure/hadoop-env.sh   |   2 -
 .../clusters/ubuntu-secure/hadoop-policy.xml    |   3 -
 .../clusters/ubuntu-secure/hbase/hbase-env.sh   |  33 +-
 src/test/clusters/ubuntu-secure/hdfs-site.xml   |  21 +-
 src/test/clusters/ubuntu-secure/httpfs-env.sh   |  26 +-
 .../ubuntu-secure/httpfs-log4j.properties       |  16 +-
 src/test/clusters/ubuntu-secure/httpfs-site.xml |  21 +-
 .../clusters/ubuntu-secure/log4j.properties     |   2 -
 src/test/clusters/ubuntu-secure/mapred-site.xml |  21 +-
 src/test/clusters/ubuntu-secure/operations.md   |  25 +-
 .../ubuntu-secure/slider/slider-client.xml      |  27 +-
 src/test/clusters/ubuntu-secure/yarn-site.xml   |  21 +-
 50 files changed, 951 insertions(+), 785 deletions(-)
----------------------------------------------------------------------