Repository: ambari Updated Branches: refs/heads/trunk 6e8dce443 -> 0564f0c3b
AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0564f0c3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0564f0c3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0564f0c3 Branch: refs/heads/trunk Commit: 0564f0c3ba2f82235925101a33c4316082c43e98 Parents: 6e8dce4 Author: Andrew Onishuk <[email protected]> Authored: Fri May 8 23:49:55 2015 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Fri May 8 23:49:55 2015 +0300 ---------------------------------------------------------------------- .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0564f0c3/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py index 7437e37..8b5db38 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py @@ -20,11 +20,8 @@ Ambari Agent """ import os -<<<<<<< HEAD from resource_management.libraries.functions import conf_select -======= from resource_management import * ->>>>>>> AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk) from resource_management.libraries.functions import format from resource_management.libraries.functions import get_kinit_path from resource_management.libraries.functions.version import format_hdp_stack_version @@ -101,15 +98,12 @@ if Script.is_hdp_stack_greater_or_equal("2.2"): mapreduce_tar_source = config['configurations']['cluster-env']['mapreduce_tar_source'] mapreduce_tar_destination = config['configurations']['cluster-env']['mapreduce_tar_destination_folder'] + "/" + os.path.basename(mapreduce_tar_source) -<<<<<<< HEAD -======= # the configuration direction for HDFS/YARN/MapR is the hadoop config # directory, which is symlinked by hadoop-client only hadoop_conf_dir = "/usr/hdp/current/hadoop-client/conf" tez_tar_source = config['configurations']['cluster-env']['tez_tar_source'] tez_tar_destination = config['configurations']['cluster-env']['tez_tar_destination_folder'] + "/" + os.path.basename(tez_tar_source) ->>>>>>> AMBARI-11034. Implement HdfsResouces and it's usage (aonishuk) limits_conf_dir = "/etc/security/limits.d" execute_path = os.environ['PATH'] + os.pathsep + hadoop_bin_dir + os.pathsep + yarn_container_bin
