You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/06/30 17:36:26 UTC
[2/3] git commit: Merge branch 'develop' into
feature/SLIDER-162_test_runner_to_bootstrap_clean_HDFS_cluster_for_test_runs
Merge branch 'develop' into feature/SLIDER-162_test_runner_to_bootstrap_clean_HDFS_cluster_for_test_runs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1bdf134a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1bdf134a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1bdf134a
Branch: refs/heads/develop
Commit: 1bdf134af5dd9fdb8186c848df8806324296f9cc
Parents: e3c5d9d 0ad4fb4
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jun 30 16:18:14 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jun 30 16:18:14 2014 +0100
----------------------------------------------------------------------
LICENSE | 423 +++++++++++++++++++
LICENSE.txt | 423 -------------------
NOTICE | 5 +
NOTICE.txt | 5 -
app-packages/accumulo/metainfo.xml | 238 +++++------
app-packages/hbase/metainfo.xml | 168 ++++----
app-packages/storm-v0_91/metainfo.xml | 229 +++++-----
slider-assembly/src/main/scripts/slider.py | 107 +++--
.../providers/agent/AgentClientProvider.java | 29 +-
.../slider/providers/agent/AgentKeys.java | 1 -
.../providers/agent/AgentProviderService.java | 53 +--
.../agent/application/metadata/Application.java | 121 ++++++
.../agent/application/metadata/Metainfo.java | 17 +-
.../application/metadata/MetainfoParser.java | 10 +-
.../agent/application/metadata/Service.java | 121 ------
.../appmaster/state/ContainerPriority.java | 8 +-
.../appmaster/state/OutstandingRequest.java | 7 +-
.../server/appmaster/state/RoleHistory.java | 8 +
.../app_packages/test_command_log/metainfo.xml | 62 ++-
.../agent/AgentMiniClusterTestBase.groovy | 41 +-
.../slider/providers/agent/AgentTestBase.groovy | 44 +-
.../agent/TestAgentAMManagementWS.groovy | 3 +-
.../slider/providers/agent/TestAgentEcho.groovy | 6 +-
.../providers/agent/TestBuildBasicAgent.groovy | 78 ++--
.../curator/TestRegistryRestResources.groovy | 3 +-
.../model/appstate/TestMockRMOperations.groovy | 2 +-
.../publisher/TestPublisherRestResources.groovy | 3 +-
.../slider/common/tools/TestSliderUtils.java | 23 +-
.../agent/TestAgentClientProvider.java | 40 +-
.../agent/TestAgentProviderService.java | 61 ++-
.../metadata/MetainfoParserTest.java | 15 +-
.../org/apache/slider/tools/TestUtility.java | 71 ++++
slider-core/src/test/python/appdef_1.zip | Bin 972 -> 0 bytes
slider-core/src/test/python/metainfo.xml | 68 ++-
.../org/apache/slider/common/tools/test.zip | Bin 1273 -> 0 bytes
.../slider/common/tools/test/metainfo.txt | 16 +
.../slider/common/tools/test/metainfo.xml | 95 +++++
.../slider/common/tools/test/someOtherFile.txt | 16 +
.../slider/common/tools/test/someOtherFile.xml | 16 +
.../agent/application/metadata/metainfo.xml | 136 +++---
.../slider/providers/hbase/HBaseRoles.java | 3 +-
41 files changed, 1543 insertions(+), 1232 deletions(-)
----------------------------------------------------------------------