ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject [6/6] git commit: Merge remote-tracking branch 'origin/trunk' into trunk
Date Wed, 16 Jul 2014 12:59:44 GMT
Merge remote-tracking branch 'origin/trunk' into trunk


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e23fa2d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e23fa2d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e23fa2d

Branch: refs/heads/trunk
Commit: 4e23fa2d8456ebc8b5cdd2cd5c09ebde11596d6a
Parents: 6244c49 b0ae1fd
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Wed Jul 16 15:59:36 2014 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Wed Jul 16 15:59:36 2014 +0300

----------------------------------------------------------------------
 .../libraries/functions/default.py              |   5 -
 .../ambari/server/agent/HeartbeatMonitor.java   |  59 ++--
 .../internal/ClusterResourceProvider.java       |   3 +-
 .../custom_actions/ambari_hdfs_rebalancer.py    |   2 +-
 .../1.3.2/hooks/after-INSTALL/scripts/params.py |  29 +-
 .../scripts/shared_initialization.py            |   2 +-
 .../after-INSTALL/templates/hadoop-env.sh.j2    | 142 --------
 .../hooks/before-INSTALL/scripts/params.py      |  61 ++--
 .../scripts/shared_initialization.py            |   6 -
 .../1.3.2/hooks/before-START/scripts/params.py  |  34 +-
 .../GANGLIA/configuration/ganglia-env.xml       |  70 ++++
 .../services/GANGLIA/configuration/global.xml   |  70 ----
 .../HDP/1.3.2/services/GANGLIA/metainfo.xml     |   2 +-
 .../services/GANGLIA/package/scripts/params.py  |  20 +-
 .../GANGLIA/package/scripts/status_params.py    |   2 +-
 .../services/HBASE/configuration/global.xml     |  50 ---
 .../services/HBASE/configuration/hbase-env.xml  | 122 +++++++
 .../HDP/1.3.2/services/HBASE/metainfo.xml       |   2 +-
 .../services/HBASE/package/scripts/hbase.py     |   5 +-
 .../services/HBASE/package/scripts/params.py    |  35 +-
 .../HBASE/package/scripts/status_params.py      |   4 +-
 .../HBASE/package/templates/hbase-env.sh.j2     | 101 ------
 .../services/HDFS/configuration/global.xml      |  87 -----
 .../services/HDFS/configuration/hadoop-env.xml  | 211 ++++++++++++
 .../stacks/HDP/1.3.2/services/HDFS/metainfo.xml |   2 +-
 .../services/HDFS/package/scripts/params.py     |  37 +-
 .../HDFS/package/scripts/status_params.py       |   4 +-
 .../services/HIVE/configuration/global.xml      | 100 ------
 .../services/HIVE/configuration/hive-env.xml    | 139 ++++++++
 .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml |   4 +-
 .../1.3.2/services/HIVE/package/scripts/hive.py |   2 +-
 .../services/HIVE/package/scripts/params.py     |  37 +-
 .../HIVE/package/scripts/status_params.py       |   4 +-
 .../HIVE/package/templates/hive-env.sh.j2       |  78 -----
 .../services/MAPREDUCE/configuration/global.xml | 150 ---------
 .../MAPREDUCE/configuration/mapred-env.xml      | 150 +++++++++
 .../HDP/1.3.2/services/MAPREDUCE/metainfo.xml   |   2 +-
 .../MAPREDUCE/package/scripts/params.py         |  18 +-
 .../MAPREDUCE/package/scripts/status_params.py  |   4 +-
 .../services/NAGIOS/configuration/global.xml    |  51 ---
 .../NAGIOS/configuration/nagios-env.xml         |  51 +++
 .../HDP/1.3.2/services/NAGIOS/metainfo.xml      |   2 +-
 .../services/NAGIOS/package/scripts/params.py   |  20 +-
 .../services/OOZIE/configuration/global.xml     |  60 ----
 .../services/OOZIE/configuration/oozie-env.xml  | 120 +++++++
 .../HDP/1.3.2/services/OOZIE/metainfo.xml       |   2 +-
 .../services/OOZIE/package/scripts/oozie.py     |   7 +-
 .../services/OOZIE/package/scripts/params.py    |  27 +-
 .../OOZIE/package/scripts/status_params.py      |   2 +-
 .../OOZIE/package/templates/oozie-env.sh.j2     |  88 -----
 .../services/PIG/configuration/pig-env.xml      |  34 ++
 .../stacks/HDP/1.3.2/services/PIG/metainfo.xml  |   2 +-
 .../services/PIG/package/scripts/params.py      |  11 +-
 .../1.3.2/services/PIG/package/scripts/pig.py   |   9 +-
 .../PIG/package/templates/pig-env.sh.j2         |  36 --
 .../services/SQOOP/configuration/sqoop-env.xml  |  49 +++
 .../HDP/1.3.2/services/SQOOP/metainfo.xml       |   3 +
 .../services/SQOOP/package/scripts/params.py    |  11 +-
 .../services/SQOOP/package/scripts/sqoop.py     |   6 +-
 .../SQOOP/package/templates/sqoop-env.sh.j2     |  36 --
 .../WEBHCAT/configuration/webhcat-env.xml       |  54 +++
 .../WEBHCAT/configuration/webhcat-site.xml      |  30 ++
 .../HDP/1.3.2/services/WEBHCAT/metainfo.xml     |   1 +
 .../services/WEBHCAT/package/scripts/params.py  |  22 +-
 .../WEBHCAT/package/scripts/status_params.py    |   2 +-
 .../services/WEBHCAT/package/scripts/webhcat.py |   2 +-
 .../WEBHCAT/package/templates/webhcat-env.sh.j2 |  63 ----
 .../services/ZOOKEEPER/configuration/global.xml |  65 ----
 .../ZOOKEEPER/configuration/zookeeper-env.xml   |  83 +++++
 .../HDP/1.3.2/services/ZOOKEEPER/metainfo.xml   |   2 +-
 .../ZOOKEEPER/package/scripts/params.py         |  27 +-
 .../ZOOKEEPER/package/scripts/status_params.py  |   2 +-
 .../ZOOKEEPER/package/scripts/zookeeper.py      |   8 +-
 .../package/templates/zookeeper-env.sh.j2       |  44 ---
 .../2.0.6/hooks/after-INSTALL/scripts/params.py |  29 +-
 .../scripts/shared_initialization.py            |   2 +-
 .../after-INSTALL/templates/hadoop-env.sh.j2    | 146 --------
 .../hooks/before-INSTALL/scripts/params.py      |  40 +--
 .../2.0.6/hooks/before-START/scripts/params.py  |  38 +--
 .../services/FLUME/configuration/flume-env.xml  |  34 ++
 .../services/FLUME/configuration/global.xml     |  34 --
 .../HDP/2.0.6/services/FLUME/metainfo.xml       |   2 +-
 .../services/FLUME/package/scripts/params.py    |   4 +-
 .../GANGLIA/configuration/ganglia-env.xml       |  70 ++++
 .../services/GANGLIA/configuration/global.xml   |  70 ----
 .../HDP/2.0.6/services/GANGLIA/metainfo.xml     |   2 +-
 .../services/GANGLIA/package/scripts/params.py  |  22 +-
 .../GANGLIA/package/scripts/status_params.py    |   2 +-
 .../services/HBASE/configuration/global.xml     |  50 ---
 .../services/HBASE/configuration/hbase-env.xml  | 122 +++++++
 .../HDP/2.0.6/services/HBASE/metainfo.xml       |   2 +-
 .../services/HBASE/package/scripts/hbase.py     |   7 +-
 .../services/HBASE/package/scripts/params.py    |  35 +-
 .../HBASE/package/scripts/status_params.py      |   4 +-
 .../HBASE/package/templates/hbase-env.sh.j2     | 100 ------
 .../services/HDFS/configuration/global.xml      |  87 -----
 .../services/HDFS/configuration/hadoop-env.xml  | 213 ++++++++++++
 .../stacks/HDP/2.0.6/services/HDFS/metainfo.xml |   2 +-
 .../services/HDFS/package/scripts/namenode.py   |   1 +
 .../services/HDFS/package/scripts/params.py     |  34 +-
 .../HDFS/package/scripts/status_params.py       |   4 +-
 .../services/HIVE/configuration/global.xml      |  90 -----
 .../services/HIVE/configuration/hive-env.xml    | 131 +++++++
 .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml |   2 +-
 .../2.0.6/services/HIVE/package/scripts/hive.py |   2 +-
 .../services/HIVE/package/scripts/params.py     |  39 +--
 .../HIVE/package/scripts/status_params.py       |   4 +-
 .../HIVE/package/templates/hive-env.sh.j2       |  79 -----
 .../services/NAGIOS/configuration/global.xml    |  51 ---
 .../NAGIOS/configuration/nagios-env.xml         |  51 +++
 .../HDP/2.0.6/services/NAGIOS/metainfo.xml      |   2 +-
 .../services/NAGIOS/package/scripts/params.py   |  22 +-
 .../services/OOZIE/configuration/global.xml     |  60 ----
 .../services/OOZIE/configuration/oozie-env.xml  | 128 +++++++
 .../HDP/2.0.6/services/OOZIE/metainfo.xml       |   2 +-
 .../services/OOZIE/package/scripts/oozie.py     |   5 +-
 .../services/OOZIE/package/scripts/params.py    |  26 +-
 .../OOZIE/package/scripts/status_params.py      |   2 +-
 .../OOZIE/package/templates/oozie-env.sh.j2     |  95 ------
 .../services/PIG/configuration/pig-env.xml      |  38 +++
 .../stacks/HDP/2.0.6/services/PIG/metainfo.xml  |   2 +-
 .../services/PIG/package/scripts/params.py      |  11 +-
 .../2.0.6/services/PIG/package/scripts/pig.py   |   5 +-
 .../PIG/package/templates/pig-env.sh.j2         |  39 ---
 .../services/SQOOP/configuration/sqoop-env.xml  |  49 +++
 .../HDP/2.0.6/services/SQOOP/metainfo.xml       |   3 +
 .../services/SQOOP/package/scripts/params.py    |  11 +-
 .../services/SQOOP/package/scripts/sqoop.py     |   7 +-
 .../SQOOP/package/templates/sqoop-env.sh.j2     |  54 ---
 .../WEBHCAT/configuration/webhcat-env.xml       |  54 +++
 .../HDP/2.0.6/services/WEBHCAT/metainfo.xml     |   1 +
 .../services/WEBHCAT/package/scripts/params.py  |  22 +-
 .../WEBHCAT/package/scripts/status_params.py    |   2 +-
 .../services/WEBHCAT/package/scripts/webhcat.py |   2 +-
 .../WEBHCAT/package/templates/webhcat-env.sh.j2 |  62 ----
 .../YARN/configuration-mapred/global.xml        |  44 ---
 .../YARN/configuration-mapred/mapred-env.xml    |  64 ++++
 .../services/YARN/configuration/global.xml      |  55 ---
 .../services/YARN/configuration/yarn-env.xml    | 173 ++++++++++
 .../stacks/HDP/2.0.6/services/YARN/metainfo.xml |   4 +-
 .../services/YARN/package/scripts/params.py     |  34 +-
 .../YARN/package/scripts/status_params.py       |   8 +-
 .../2.0.6/services/YARN/package/scripts/yarn.py |   4 +-
 .../YARN/package/templates/mapred-env.sh.j2     |  27 --
 .../YARN/package/templates/yarn-env.sh.j2       | 146 --------
 .../services/ZOOKEEPER/configuration/global.xml |  65 ----
 .../ZOOKEEPER/configuration/zookeeper-env.xml   |  83 +++++
 .../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml   |   2 +-
 .../ZOOKEEPER/package/scripts/params.py         |  27 +-
 .../ZOOKEEPER/package/scripts/status_params.py  |   2 +-
 .../ZOOKEEPER/package/scripts/zookeeper.py      |   8 +-
 .../package/templates/zookeeper-env.sh.j2       |  44 ---
 .../FALCON/configuration/falcon-env.xml         | 109 ++++++
 .../services/FALCON/configuration/global.xml    |  63 ----
 .../stacks/HDP/2.1/services/FALCON/metainfo.xml |   2 +-
 .../services/FALCON/package/scripts/falcon.py   |   2 +-
 .../services/FALCON/package/scripts/params.py   |  31 +-
 .../FALCON/package/scripts/status_params.py     |   2 +-
 .../FALCON/package/templates/falcon-env.sh.j2   |  73 ----
 .../HDP/2.1/services/HIVE/metainfo.xml.orig     |  51 +++
 .../HDP/2.1/services/HIVE/metainfo.xml.rej      |  13 +
 .../stacks/HDP/2.1/services/OOZIE/metainfo.xml  |   2 +-
 .../stacks/HDP/2.1/services/SQOOP/metainfo.xml  |   4 +
 .../2.1/services/STORM/configuration/global.xml |  39 ---
 .../services/STORM/configuration/storm-env.xml  |  55 +++
 .../stacks/HDP/2.1/services/STORM/metainfo.xml  |   2 +-
 .../services/STORM/package/scripts/params.py    |  13 +-
 .../STORM/package/scripts/status_params.py      |   2 +-
 .../2.1/services/STORM/package/scripts/storm.py |   7 +-
 .../STORM/package/templates/storm-env.sh.j2     |  45 ---
 .../2.1/services/TEZ/configuration/global.xml   |  29 --
 .../2.1/services/TEZ/configuration/tez-env.xml  |  45 +++
 .../stacks/HDP/2.1/services/TEZ/metainfo.xml    |   2 +-
 .../2.1/services/TEZ/package/scripts/params.py  |   5 +-
 .../HDP/2.1/services/TEZ/package/scripts/tez.py |   7 +-
 .../TEZ/package/templates/tez-env.sh.j2         |  23 --
 .../HDP/2.1/services/WEBHCAT/metainfo.xml       |   1 +
 .../2.1/services/YARN/configuration/global.xml  |  60 ----
 .../services/YARN/configuration/yarn-env.xml    | 178 ++++++++++
 .../stacks/HDP/2.1/services/YARN/metainfo.xml   |   2 +-
 .../server/agent/TestHeartbeatMonitor.java      |   4 +-
 .../internal/ClusterResourceProviderTest.java   |  26 +-
 .../stacks/1.3.2/HBASE/test_hbase_client.py     |   8 +-
 .../stacks/1.3.2/HBASE/test_hbase_master.py     |   8 +-
 .../1.3.2/HBASE/test_hbase_regionserver.py      |   8 +-
 .../stacks/1.3.2/HIVE/test_hive_client.py       |   4 +-
 .../stacks/1.3.2/HIVE/test_hive_metastore.py    |   4 +-
 .../stacks/1.3.2/HIVE/test_hive_server.py       |   4 +-
 .../stacks/1.3.2/OOZIE/test_oozie_client.py     |   6 +-
 .../stacks/1.3.2/OOZIE/test_oozie_server.py     |  12 +-
 .../python/stacks/1.3.2/PIG/test_pig_client.py  |   8 +-
 .../python/stacks/1.3.2/SQOOP/test_sqoop.py     |   4 +-
 .../stacks/1.3.2/WEBHCAT/test_webhcat_server.py |   4 +-
 .../1.3.2/ZOOKEEPER/test_zookeeper_client.py    |   4 +-
 .../1.3.2/ZOOKEEPER/test_zookeeper_server.py    |   4 +-
 .../1.3.2/configs/default.hbasedecom.json       | 187 ++++++----
 .../python/stacks/1.3.2/configs/default.json    | 190 +++++++----
 .../1.3.2/configs/default.non_gmetad_host.json  | 187 ++++++----
 .../python/stacks/1.3.2/configs/secured.json    | 154 +++++++++
 .../hooks/after-INSTALL/test_after_install.py   |   2 +-
 .../hooks/before-START/test_before_start.py     |   4 +-
 .../stacks/2.0.6/HBASE/test_hbase_client.py     |  14 +-
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |   8 +-
 .../2.0.6/HBASE/test_hbase_regionserver.py      |   8 +-
 .../stacks/2.0.6/HIVE/test_hive_client.py       |   4 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |   4 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |   4 +-
 .../stacks/2.0.6/OOZIE/test_oozie_client.py     |  10 +-
 .../stacks/2.0.6/OOZIE/test_oozie_server.py     |   6 +-
 .../python/stacks/2.0.6/PIG/test_pig_client.py  |  10 +-
 .../python/stacks/2.0.6/SQOOP/test_sqoop.py     |   5 +-
 .../stacks/2.0.6/WEBHCAT/test_webhcat_server.py |   4 +-
 .../stacks/2.0.6/YARN/test_historyserver.py     |   8 +-
 .../stacks/2.0.6/YARN/test_mapreduce2_client.py |   8 +-
 .../stacks/2.0.6/YARN/test_nodemanager.py       |   8 +-
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |   8 +-
 .../stacks/2.0.6/YARN/test_yarn_client.py       |  12 +-
 .../2.0.6/ZOOKEEPER/test_zookeeper_client.py    |  16 +-
 .../2.0.6/ZOOKEEPER/test_zookeeper_server.py    |  16 +-
 .../2.0.6/configs/default.hbasedecom.json       | 207 +++++++-----
 .../python/stacks/2.0.6/configs/default.json    | 213 +++++++-----
 .../2.0.6/configs/default.non_gmetad_host.json  | 202 ++++++-----
 .../python/stacks/2.0.6/configs/ha_default.json | 129 +++++++
 .../python/stacks/2.0.6/configs/ha_secured.json | 283 ++++++++++------
 .../python/stacks/2.0.6/configs/secured.json    | 337 ++++++++++---------
 .../hooks/after-INSTALL/test_after_install.py   |   4 +-
 .../stacks/2.1/FALCON/test_falcon_client.py     |   2 +-
 .../stacks/2.1/FALCON/test_falcon_server.py     |   2 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |  20 +-
 .../stacks/2.1/STORM/test_storm_drpc_server.py  |   6 +-
 .../stacks/2.1/STORM/test_storm_nimbus.py       |   6 +-
 .../stacks/2.1/STORM/test_storm_nimbus_prod.py  |   8 +-
 .../2.1/STORM/test_storm_rest_api_service.py    |   6 +-
 .../stacks/2.1/STORM/test_storm_supervisor.py   |   6 +-
 .../2.1/STORM/test_storm_supervisor_prod.py     |   6 +-
 .../stacks/2.1/STORM/test_storm_ui_server.py    |   6 +-
 .../python/stacks/2.1/TEZ/test_tez_client.py    |   5 +-
 .../stacks/2.1/YARN/test_apptimelineserver.py   |   4 +-
 .../test/python/stacks/2.1/configs/default.json | 123 ++++++-
 .../test/python/stacks/2.1/configs/secured.json | 168 +++++++++
 240 files changed, 5229 insertions(+), 4352 deletions(-)
----------------------------------------------------------------------



Mime
View raw message