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/09/11 04:55:21 UTC
[17/21] git commit: Merge branch 'develop' into
feature/SLIDER-86-windows
Merge branch 'develop' into feature/SLIDER-86-windows
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4a0b783b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4a0b783b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4a0b783b
Branch: refs/heads/feature/slider_install_package
Commit: 4a0b783ba24dcaed93c4f6b61226359b063a0487
Parents: 16d625e 3c1d9dc
Author: Steve Loughran <st...@apache.org>
Authored: Wed Sep 10 13:57:46 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Sep 10 13:57:46 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo/README.txt | 17 +-
app-packages/accumulo/pom.xml | 90 +++++-
app-packages/accumulo/src/assembly/accumulo.xml | 2 +-
.../funtest/accumulo/AccumuloBasicIT.groovy | 7 +
.../accumulo/AccumuloMonitorSSLIT.groovy | 7 +-
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 7 +-
.../accumulo/src/test/resources/appConfig.json | 55 ++++
.../src/test/resources/appConfig_kerberos.json | 8 +-
.../test/resources/appConfig_monitor_ssl.json | 4 +-
.../appConfig_monitor_ssl_kerberos.json | 57 ++++
.../src/test/resources/appConfig_ssl.json | 4 +-
.../test/resources/appConfig_ssl_kerberos.json | 59 ++++
app-packages/hbase/README.txt | 43 ++-
app-packages/hbase/appConfig.json | 4 +-
app-packages/hbase/metainfo.xml | 4 +-
app-packages/hbase/pom.xml | 317 +++++++++++--------
app-packages/hbase/src/assembly/hbase.xml | 16 +-
app-packages/storm/README.txt | 20 +-
.../slider/core/launch/AppMasterLauncher.java | 6 +-
.../security/FsDelegationTokenManager.java | 39 ++-
.../TestFsDelegationTokenManager.groovy | 3 +-
21 files changed, 561 insertions(+), 208 deletions(-)
----------------------------------------------------------------------