Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8a48392b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8a48392b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8a48392b
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 8a48392bbd9c9fe56f027bf40b23f300f4067863
Parents: 428f3a7 61a5eac
Author: Steve Loughran <[email protected]>
Authored: Tue Aug 26 16:49:39 2014 +0100
Committer: Steve Loughran <[email protected]>
Committed: Tue Aug 26 16:49:39 2014 +0100
----------------------------------------------------------------------
README.md | 28 +++
app-packages/accumulo/README.txt | 31 +++
app-packages/accumulo/appConfig.json | 27 +--
app-packages/accumulo/metainfo.xml | 16 ++
.../accumulo/package/scripts/accumulo_client.py | 2 +-
.../package/scripts/accumulo_configuration.py | 64 ++++-
.../accumulo/package/scripts/accumulo_script.py | 53 +----
.../package/scripts/accumulo_service.py | 2 +-
app-packages/accumulo/package/scripts/params.py | 28 ++-
.../package/templates/accumulo-env.sh.j2 | 2 +-
.../accumulo/package/templates/client.conf.j2 | 18 ++
app-packages/accumulo/pom.xml | 34 ++-
app-packages/accumulo/src/assembly/accumulo.xml | 24 +-
.../slider/accumulo/CustomAuthenticator.java | 118 ++++++++++
.../apache/slider/accumulo/ProviderUtil.java | 57 +++++
.../AccumuloAgentCommandTestBase.groovy | 10 +-
.../funtest/accumulo/AccumuloBasicIT.groovy | 96 ++++++--
.../accumulo/AccumuloMonitorSSLIT.groovy | 2 +-
.../funtest/accumulo/AccumuloReadWriteIT.groovy | 7 +-
.../accumulo/AccumuloReadWriteSSLIT.groovy | 73 ++++++
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 99 ++++++++
.../slider/funtest/accumulo/CertUtil.java | 235 +++++++++++++++++++
.../test/resources/appConfig_monitor_ssl.json | 30 +--
.../src/test/resources/appConfig_ssl.json | 54 +++++
.../accumulo/src/test/resources/resources.json | 4 +-
.../test/resources/resources_with_client.json | 41 ++++
pom.xml | 14 +-
.../org/apache/slider/client/SliderClient.java | 89 ++++++-
.../common/SliderXMLConfKeysForTesting.java | 6 +-
.../org/apache/slider/core/conf/ConfTree.java | 7 +
.../slider/core/conf/ConfTreeOperations.java | 4 +-
.../services/security/CertificateManager.java | 54 +++--
.../apache/slider/test/SliderTestBase.groovy | 2 +-
.../web/rest/agent/TestAMAgentWebServices.java | 48 ++--
.../framework/AgentCommandTestBase.groovy | 5 +-
.../accumulo/slider-accumulo-provider/pom.xml | 6 +
.../failures/TestKilledHBaseAM.groovy | 1 -
37 files changed, 1193 insertions(+), 198 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8a48392b/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 421a596,8292073..d8a0353
--- a/pom.xml
+++ b/pom.xml
@@@ -118,10 -118,10 +118,10 @@@
<!--
core artifacts
-->
- <hadoop.version>2.6.0-SNAPSHOT</hadoop.version>
+ <hadoop.version>3.0.0-SNAPSHOT</hadoop.version>
<hbase.version>0.98.4-hadoop2</hbase.version>
- <accumulo.version>1.6.0</accumulo.version>
+ <accumulo.version>1.6.1-SNAPSHOT</accumulo.version>
<!--
artifact versions
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8a48392b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
