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/06/11 20:28:53 UTC
[3/3] git commit: Merge branch 'feature/slider_119_agent_cleanup'
into develop
Merge branch 'feature/slider_119_agent_cleanup' 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/f8b143a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f8b143a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f8b143a0
Branch: refs/heads/develop
Commit: f8b143a0fe2d7555ef6995ba6fd345186f35576e
Parents: 94e177f 3dfb319
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Jun 11 10:55:07 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Jun 11 10:55:07 2014 -0700
----------------------------------------------------------------------
app-packages/accumulo-v1_5/appConfig.json | 2 +-
app-packages/hbase-v0_96/appConfig.json | 4 +-
.../python/agent/CustomServiceOrchestrator.py | 2 +
.../src/main/python/agent/PythonExecutor.py | 15 ++++++--
.../python/resource_management/core/logger.py | 4 +-
.../core/providers/package/apt.py | 4 +-
.../python/resource_management/core/shell.py | 19 +++++++---
.../libraries/functions/__init__.py | 1 +
.../libraries/functions/format.py | 4 +-
.../libraries/functions/get_port_from_url.py | 40 ++++++++++++++++++++
.../functions/get_unique_id_and_date.py | 2 +-
.../libraries/providers/copy_from_local.py | 2 +-
.../libraries/providers/execute_hadoop.py | 2 +-
.../libraries/script/hook.py | 10 ++++-
.../libraries/script/script.py | 28 +++++++++++---
.../src/test/python/agent/TestActionQueue.py | 1 +
.../agent/TestCustomServiceOrchestrator.py | 2 +-
.../src/test/python/agent/TestPythonExecutor.py | 10 ++---
.../resource_management/TestLibraryFunctions.py | 33 ++++++++++++++++
.../resource_management/TestPackageResource.py | 2 +-
.../providers/agent/AgentProviderService.java | 17 ++++++---
.../agent/TestAgentProviderService.java | 1 +
22 files changed, 165 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f8b143a0/app-packages/accumulo-v1_5/appConfig.json
----------------------------------------------------------------------
diff --cc app-packages/accumulo-v1_5/appConfig.json
index 49ac995,f453b91..aee8213
--- a/app-packages/accumulo-v1_5/appConfig.json
+++ b/app-packages/accumulo-v1_5/appConfig.json
@@@ -25,8 -25,7 +25,8 @@@
"site.global.accumulo_root_password": "secret",
"site.global.user_group": "hadoop",
"site.global.security_enabled": "false",
+ "site.global.monitor_protocol": "http",
- "site.accumulo-site.instance.dfs.dir": "/apps/accumulo/data",
+ "site.accumulo-site.instance.dfs.dir": "${DEFAULT_DATA_DIR}/data",
"site.accumulo-site.instance.zookeeper.host": "${ZK_HOST}",
"site.accumulo-site.instance.secret": "DEFAULT",
"site.accumulo-site.tserver.memory.maps.max": "80M",