Merge branch 'trunk' into branch-alerts-dev

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

Branch: refs/heads/trunk
Commit: 6f9398f0ff45da86c001eb86322695a3d76b7232
Parents: 054745d bd851c1
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Wed Oct 1 11:26:26 2014 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Wed Oct 1 11:26:26 2014 -0400

----------------------------------------------------------------------
 .../resources/ui/admin-web/app/styles/main.css  |     2 +-
 .../src/main/python/ambari_agent/ActionQueue.py |     5 +-
 .../python/ambari_agent/ActualConfigHandler.py  |     5 +-
 .../test/python/ambari_agent/TestActionQueue.py |    55 +
 .../ambari_agent/TestActualConfigHandler.py     |    25 +-
 ambari-server/pom.xml                           |     2 +
 ambari-server/sbin/ambari-server                |     2 +-
 .../ambari/server/agent/ExecutionCommand.java   |     1 +
 .../server/api/util/StackExtensionHelper.java   |     6 +
 .../AmbariManagementControllerImpl.java         |    28 +
 .../ambari/server/state/ComponentInfo.java      |    21 +-
 .../server/upgrade/UpgradeCatalog170.java       |     2 +
 ambari-server/src/main/python/ambari-server.py  |   162 +-
 .../0.8/blueprints/multinode-default.json       |   182 +
 .../0.8/blueprints/singlenode-default.json      |   136 +
 .../BIGTOP/0.8/configuration/cluster-env.xml    |    56 +
 .../0.8/hooks/after-INSTALL/scripts/hook.py     |    35 +
 .../0.8/hooks/after-INSTALL/scripts/params.py   |    68 +
 .../scripts/shared_initialization.py            |    52 +
 .../BIGTOP/0.8/hooks/before-ANY/scripts/hook.py |    33 +
 .../0.8/hooks/before-ANY/scripts/params.py      |    33 +
 .../before-ANY/scripts/shared_initialization.py |    58 +
 .../before-INSTALL/files/changeToSecureUid.sh   |    50 +
 .../0.8/hooks/before-INSTALL/scripts/hook.py    |    39 +
 .../0.8/hooks/before-INSTALL/scripts/params.py  |   118 +
 .../scripts/repo_initialization.py              |    57 +
 .../scripts/shared_initialization.py            |    94 +
 .../before-INSTALL/templates/repo_suse_rhel.j2  |     7 +
 .../before-INSTALL/templates/repo_ubuntu.j2     |     1 +
 .../0.8/hooks/before-RESTART/scripts/hook.py    |    29 +
 .../hooks/before-START/files/checkForFormat.sh  |    62 +
 .../before-START/files/task-log4j.properties    |   134 +
 .../0.8/hooks/before-START/scripts/hook.py      |    38 +
 .../0.8/hooks/before-START/scripts/params.py    |   146 +
 .../scripts/shared_initialization.py            |   175 +
 .../templates/commons-logging.properties.j2     |    43 +
 .../templates/exclude_hosts_list.j2             |    21 +
 .../templates/hadoop-metrics2.properties.j2     |    65 +
 .../before-START/templates/health_check-v2.j2   |    81 +
 .../before-START/templates/health_check.j2      |   109 +
 .../templates/include_hosts_list.j2             |    21 +
 .../resources/stacks/BIGTOP/0.8/metainfo.xml    |    22 +
 .../stacks/BIGTOP/0.8/repos/repoinfo.xml        |    35 +
 .../stacks/BIGTOP/0.8/role_command_order.json   |    74 +
 .../services/FLUME/configuration/flume-conf.xml |    31 +
 .../services/FLUME/configuration/flume-env.xml  |    40 +
 .../FLUME/configuration/flume-log4j.xml         |    31 +
 .../BIGTOP/0.8/services/FLUME/metainfo.xml      |    69 +
 .../BIGTOP/0.8/services/FLUME/metrics.json      |   716 +
 .../0.8/services/FLUME/package/scripts/flume.py |   250 +
 .../FLUME/package/scripts/flume_check.py        |    40 +
 .../FLUME/package/scripts/flume_handler.py      |   121 +
 .../services/FLUME/package/scripts/params.py    |    60 +
 .../FLUME/package/templates/flume.conf.j2       |    24 +
 .../FLUME/package/templates/log4j.properties.j2 |    67 +
 .../GANGLIA/configuration/ganglia-env.xml       |    72 +
 .../BIGTOP/0.8/services/GANGLIA/metainfo.xml    |   127 +
 .../GANGLIA/package/files/checkGmetad.sh        |    37 +
 .../GANGLIA/package/files/checkGmond.sh         |    62 +
 .../GANGLIA/package/files/checkRrdcached.sh     |    34 +
 .../services/GANGLIA/package/files/gmetad.init  |    73 +
 .../services/GANGLIA/package/files/gmetadLib.sh |   204 +
 .../services/GANGLIA/package/files/gmond.init   |    73 +
 .../services/GANGLIA/package/files/gmondLib.sh  |   539 +
 .../GANGLIA/package/files/rrdcachedLib.sh       |    47 +
 .../GANGLIA/package/files/setupGanglia.sh       |   141 +
 .../GANGLIA/package/files/startGmetad.sh        |    68 +
 .../GANGLIA/package/files/startGmond.sh         |    85 +
 .../GANGLIA/package/files/startRrdcached.sh     |    79 +
 .../GANGLIA/package/files/stopGmetad.sh         |    43 +
 .../services/GANGLIA/package/files/stopGmond.sh |    54 +
 .../GANGLIA/package/files/stopRrdcached.sh      |    41 +
 .../GANGLIA/package/files/teardownGanglia.sh    |    28 +
 .../GANGLIA/package/scripts/functions.py        |    31 +
 .../services/GANGLIA/package/scripts/ganglia.py |    97 +
 .../GANGLIA/package/scripts/ganglia_monitor.py  |   236 +
 .../package/scripts/ganglia_monitor_service.py  |    27 +
 .../GANGLIA/package/scripts/ganglia_server.py   |   119 +
 .../package/scripts/ganglia_server_service.py   |    27 +
 .../services/GANGLIA/package/scripts/params.py  |   155 +
 .../GANGLIA/package/scripts/status_params.py    |    25 +
 .../GANGLIA/package/templates/ganglia.conf.j2   |    34 +
 .../package/templates/gangliaClusters.conf.j2   |    43 +
 .../GANGLIA/package/templates/gangliaEnv.sh.j2  |    46 +
 .../GANGLIA/package/templates/gangliaLib.sh.j2  |    85 +
 .../GANGLIA/package/templates/rrd.py.j2         |   361 +
 .../services/HBASE/configuration/hbase-env.xml  |   133 +
 .../HBASE/configuration/hbase-log4j.xml         |   143 +
 .../HBASE/configuration/hbase-policy.xml        |    53 +
 .../services/HBASE/configuration/hbase-site.xml |   370 +
 .../BIGTOP/0.8/services/HBASE/metainfo.xml      |   139 +
 .../BIGTOP/0.8/services/HBASE/metrics.json      | 13635 +++++++++++++++++
 .../HBASE/package/files/draining_servers.rb     |   164 +
 .../HBASE/package/files/hbaseSmokeVerify.sh     |    33 +
 .../services/HBASE/package/scripts/__init__.py  |    19 +
 .../services/HBASE/package/scripts/functions.py |    40 +
 .../0.8/services/HBASE/package/scripts/hbase.py |   144 +
 .../HBASE/package/scripts/hbase_client.py       |    43 +
 .../HBASE/package/scripts/hbase_decommission.py |    74 +
 .../HBASE/package/scripts/hbase_master.py       |    70 +
 .../HBASE/package/scripts/hbase_regionserver.py |    66 +
 .../HBASE/package/scripts/hbase_service.py      |    51 +
 .../services/HBASE/package/scripts/params.py    |   123 +
 .../HBASE/package/scripts/service_check.py      |    79 +
 .../HBASE/package/scripts/status_params.py      |    26 +
 ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 |    81 +
 ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 |    80 +
 .../HBASE/package/templates/hbase-smoke.sh.j2   |    44 +
 .../package/templates/hbase_client_jaas.conf.j2 |    23 +
 .../templates/hbase_grant_permissions.j2        |    39 +
 .../package/templates/hbase_master_jaas.conf.j2 |    26 +
 .../templates/hbase_regionserver_jaas.conf.j2   |    26 +
 .../HBASE/package/templates/regionservers.j2    |    20 +
 .../services/HDFS/configuration/core-site.xml   |   180 +
 .../services/HDFS/configuration/hadoop-env.xml  |   198 +
 .../HDFS/configuration/hadoop-policy.xml        |   134 +
 .../services/HDFS/configuration/hdfs-log4j.xml  |   201 +
 .../services/HDFS/configuration/hdfs-site.xml   |   496 +
 .../BIGTOP/0.8/services/HDFS/metainfo.xml       |   225 +
 .../BIGTOP/0.8/services/HDFS/metrics.json       |  7840 ++++++++++
 .../HDFS/package/files/checkForFormat.sh        |    68 +
 .../services/HDFS/package/files/checkWebUI.py   |    53 +
 .../scripts/balancer-emulator/balancer-err.log  |  1032 ++
 .../scripts/balancer-emulator/balancer.log      |    29 +
 .../scripts/balancer-emulator/hdfs-command.py   |    45 +
 .../services/HDFS/package/scripts/datanode.py   |    59 +
 .../0.8/services/HDFS/package/scripts/hdfs.py   |    64 +
 .../HDFS/package/scripts/hdfs_client.py         |    53 +
 .../HDFS/package/scripts/hdfs_datanode.py       |    47 +
 .../HDFS/package/scripts/hdfs_namenode.py       |   157 +
 .../HDFS/package/scripts/hdfs_rebalance.py      |   130 +
 .../HDFS/package/scripts/hdfs_snamenode.py      |    45 +
 .../HDFS/package/scripts/journalnode.py         |    73 +
 .../services/HDFS/package/scripts/namenode.py   |   134 +
 .../0.8/services/HDFS/package/scripts/params.py |   213 +
 .../HDFS/package/scripts/service_check.py       |   111 +
 .../services/HDFS/package/scripts/snamenode.py  |    65 +
 .../HDFS/package/scripts/status_params.py       |    31 +
 .../0.8/services/HDFS/package/scripts/utils.py  |    66 +
 .../services/HDFS/package/scripts/zkfc_slave.py |    64 +
 .../package/templates/exclude_hosts_list.j2     |    21 +
 .../HDFS/package/templates/hdfs.conf.j2         |    35 +
 .../services/HDFS/package/templates/slaves.j2   |    21 +
 .../services/HIVE/configuration/hive-env.xml    |   134 +
 .../HIVE/configuration/hive-exec-log4j.xml      |   111 +
 .../services/HIVE/configuration/hive-log4j.xml  |   120 +
 .../services/HIVE/configuration/hive-site.xml   |   314 +
 .../HIVE/etc/hive-schema-0.12.0.mysql.sql       |   777 +
 .../HIVE/etc/hive-schema-0.12.0.oracle.sql      |   718 +
 .../HIVE/etc/hive-schema-0.12.0.postgres.sql    |  1406 ++
 .../BIGTOP/0.8/services/HIVE/metainfo.xml       |   271 +
 .../services/HIVE/package/files/addMysqlUser.sh |    41 +
 .../HIVE/package/files/addPostgreSQLUser.sh     |    44 +
 .../services/HIVE/package/files/hcatSmoke.sh    |    36 +
 .../services/HIVE/package/files/hiveSmoke.sh    |    24 +
 .../services/HIVE/package/files/hiveserver2.sql |    23 +
 .../HIVE/package/files/hiveserver2Smoke.sh      |    32 +
 .../0.8/services/HIVE/package/files/pigSmoke.sh |    18 +
 .../HIVE/package/files/startMetastore.sh        |    23 +
 .../services/HIVE/package/scripts/__init__.py   |    19 +
 .../0.8/services/HIVE/package/scripts/hcat.py   |    55 +
 .../HIVE/package/scripts/hcat_client.py         |    43 +
 .../HIVE/package/scripts/hcat_service_check.py  |    78 +
 .../0.8/services/HIVE/package/scripts/hive.py   |   213 +
 .../HIVE/package/scripts/hive_client.py         |    42 +
 .../HIVE/package/scripts/hive_metastore.py      |    64 +
 .../HIVE/package/scripts/hive_server.py         |    66 +
 .../HIVE/package/scripts/hive_service.py        |   110 +
 .../HIVE/package/scripts/install_jars.py        |    99 +
 .../HIVE/package/scripts/mysql_server.py        |    70 +
 .../HIVE/package/scripts/mysql_service.py       |    46 +
 .../0.8/services/HIVE/package/scripts/params.py |   215 +
 .../HIVE/package/scripts/postgresql_server.py   |   109 +
 .../HIVE/package/scripts/postgresql_service.py  |    39 +
 .../HIVE/package/scripts/service_check.py       |    47 +
 .../HIVE/package/scripts/status_params.py       |    37 +
 .../HIVE/package/templates/hcat-env.sh.j2       |    43 +
 .../package/templates/startHiveserver2.sh.j2    |    29 +
 .../NAGIOS/configuration/nagios-env.xml         |    53 +
 .../BIGTOP/0.8/services/NAGIOS/metainfo.xml     |   160 +
 .../NAGIOS/package/files/check_aggregate.php    |   248 +
 .../NAGIOS/package/files/check_ambari_alerts.py |    80 +
 .../package/files/check_checkpoint_time.py      |   112 +
 .../services/NAGIOS/package/files/check_cpu.php |   109 +
 .../services/NAGIOS/package/files/check_cpu.pl  |   114 +
 .../NAGIOS/package/files/check_cpu_ha.php       |   116 +
 .../package/files/check_datanode_storage.php    |   100 +
 .../NAGIOS/package/files/check_hdfs_blocks.php  |   102 +
 .../package/files/check_hdfs_capacity.php       |   109 +
 .../files/check_hive_metastore_status.sh        |    45 +
 .../NAGIOS/package/files/check_hue_status.sh    |    31 +
 .../files/check_mapred_local_dir_used.sh        |    34 +
 .../package/files/check_name_dir_status.php     |    93 +
 .../NAGIOS/package/files/check_namenodes_ha.sh  |    83 +
 .../package/files/check_nodemanager_health.sh   |    45 +
 .../NAGIOS/package/files/check_oozie_status.sh  |    45 +
 .../NAGIOS/package/files/check_rpcq_latency.php |   104 +
 .../package/files/check_rpcq_latency_ha.php     |   115 +
 .../package/files/check_templeton_status.sh     |    46 +
 .../NAGIOS/package/files/check_webui.sh         |   103 +
 .../NAGIOS/package/files/check_webui_ha.sh      |    64 +
 .../NAGIOS/package/files/check_wrapper.sh       |    94 +
 .../package/files/hdp_mon_nagios_addons.conf    |    24 +
 .../NAGIOS/package/files/hdp_nagios_init.php    |    81 +
 .../NAGIOS/package/files/nagios_alerts.php      |   513 +
 .../services/NAGIOS/package/files/sys_logger.py |   186 +
 .../NAGIOS/package/scripts/functions.py         |    47 +
 .../services/NAGIOS/package/scripts/nagios.py   |   112 +
 .../NAGIOS/package/scripts/nagios_server.py     |   111 +
 .../package/scripts/nagios_server_config.py     |    98 +
 .../NAGIOS/package/scripts/nagios_service.py    |   103 +
 .../services/NAGIOS/package/scripts/params.py   |   287 +
 .../NAGIOS/package/scripts/status_params.py     |    29 +
 .../NAGIOS/package/templates/contacts.cfg.j2    |   109 +
 .../package/templates/hadoop-commands.cfg.j2    |   166 +
 .../package/templates/hadoop-hostgroups.cfg.j2  |    33 +
 .../package/templates/hadoop-hosts.cfg.j2       |    53 +
 .../templates/hadoop-servicegroups.cfg.j2       |   119 +
 .../package/templates/hadoop-services.cfg.j2    |   804 +
 .../NAGIOS/package/templates/nagios.cfg.j2      |  1365 ++
 .../NAGIOS/package/templates/nagios.conf.j2     |    84 +
 .../services/NAGIOS/package/templates/nagios.j2 |   164 +
 .../NAGIOS/package/templates/resource.cfg.j2    |    51 +
 .../services/OOZIE/configuration/oozie-env.xml  |   129 +
 .../OOZIE/configuration/oozie-log4j.xml         |    97 +
 .../services/OOZIE/configuration/oozie-site.xml |   312 +
 .../BIGTOP/0.8/services/OOZIE/metainfo.xml      |   165 +
 .../services/OOZIE/package/files/oozieSmoke2.sh |   107 +
 .../OOZIE/package/files/wrap_ooziedb.sh         |    31 +
 .../0.8/services/OOZIE/package/scripts/oozie.py |   152 +
 .../OOZIE/package/scripts/oozie_client.py       |    43 +
 .../OOZIE/package/scripts/oozie_server.py       |    56 +
 .../OOZIE/package/scripts/oozie_service.py      |    75 +
 .../services/OOZIE/package/scripts/params.py    |   121 +
 .../OOZIE/package/scripts/service_check.py      |    59 +
 .../OOZIE/package/scripts/status_params.py      |    26 +
 .../package/templates/oozie-log4j.properties.j2 |    92 +
 .../0.8/services/PIG/configuration/pig-env.xml  |    38 +
 .../services/PIG/configuration/pig-log4j.xml    |    62 +
 .../PIG/configuration/pig-properties.xml        |    92 +
 .../stacks/BIGTOP/0.8/services/PIG/metainfo.xml |    85 +
 .../0.8/services/PIG/package/files/pigSmoke.sh  |    18 +
 .../0.8/services/PIG/package/scripts/params.py  |    45 +
 .../0.8/services/PIG/package/scripts/pig.py     |    58 +
 .../services/PIG/package/scripts/pig_client.py  |    41 +
 .../PIG/package/scripts/service_check.py        |    67 +
 .../services/SQOOP/configuration/sqoop-env.xml  |    54 +
 .../BIGTOP/0.8/services/SQOOP/metainfo.xml      |    92 +
 .../services/SQOOP/package/scripts/__init__.py  |    19 +
 .../services/SQOOP/package/scripts/params.py    |    37 +
 .../SQOOP/package/scripts/service_check.py      |    37 +
 .../0.8/services/SQOOP/package/scripts/sqoop.py |    57 +
 .../SQOOP/package/scripts/sqoop_client.py       |    41 +
 .../WEBHCAT/configuration/webhcat-env.xml       |    54 +
 .../WEBHCAT/configuration/webhcat-site.xml      |   138 +
 .../BIGTOP/0.8/services/WEBHCAT/metainfo.xml    |   107 +
 .../WEBHCAT/package/files/templetonSmoke.sh     |    96 +
 .../WEBHCAT/package/scripts/__init__.py         |    20 +
 .../services/WEBHCAT/package/scripts/params.py  |    83 +
 .../WEBHCAT/package/scripts/service_check.py    |    45 +
 .../WEBHCAT/package/scripts/status_params.py    |    26 +
 .../services/WEBHCAT/package/scripts/webhcat.py |    93 +
 .../WEBHCAT/package/scripts/webhcat_server.py   |    53 +
 .../WEBHCAT/package/scripts/webhcat_service.py  |    40 +
 .../YARN/configuration-mapred/mapred-env.xml    |    65 +
 .../YARN/configuration-mapred/mapred-site.xml   |   366 +
 .../YARN/configuration/capacity-scheduler.xml   |   124 +
 .../services/YARN/configuration/yarn-env.xml    |   184 +
 .../services/YARN/configuration/yarn-log4j.xml  |    71 +
 .../services/YARN/configuration/yarn-site.xml   |   413 +
 .../BIGTOP/0.8/services/YARN/metainfo.xml       |   250 +
 .../BIGTOP/0.8/services/YARN/metrics.json       |  5360 +++++++
 .../files/validateYarnComponentStatus.py        |   170 +
 .../services/YARN/package/scripts/__init__.py   |    20 +
 .../scripts/application_timeline_server.py      |    55 +
 .../YARN/package/scripts/historyserver.py       |    53 +
 .../package/scripts/mapred_service_check.py     |    76 +
 .../YARN/package/scripts/mapreduce2_client.py   |    42 +
 .../YARN/package/scripts/nodemanager.py         |    59 +
 .../0.8/services/YARN/package/scripts/params.py |   157 +
 .../YARN/package/scripts/resourcemanager.py     |   100 +
 .../services/YARN/package/scripts/service.py    |    75 +
 .../YARN/package/scripts/service_check.py       |    67 +
 .../YARN/package/scripts/status_params.py       |    35 +
 .../0.8/services/YARN/package/scripts/yarn.py   |   231 +
 .../YARN/package/scripts/yarn_client.py         |    42 +
 .../package/templates/container-executor.cfg.j2 |    40 +
 .../package/templates/exclude_hosts_list.j2     |    21 +
 .../YARN/package/templates/mapreduce.conf.j2    |    35 +
 .../package/templates/taskcontroller.cfg.j2     |    38 +
 .../YARN/package/templates/yarn.conf.j2         |    35 +
 .../ZOOKEEPER/configuration/zookeeper-env.xml   |    84 +
 .../ZOOKEEPER/configuration/zookeeper-log4j.xml |   101 +
 .../BIGTOP/0.8/services/ZOOKEEPER/metainfo.xml  |    89 +
 .../services/ZOOKEEPER/package/files/zkEnv.sh   |    96 +
 .../ZOOKEEPER/package/files/zkServer.sh         |   120 +
 .../ZOOKEEPER/package/files/zkService.sh        |    26 +
 .../services/ZOOKEEPER/package/files/zkSmoke.sh |    78 +
 .../ZOOKEEPER/package/scripts/__init__.py       |    20 +
 .../ZOOKEEPER/package/scripts/params.py         |    76 +
 .../ZOOKEEPER/package/scripts/service_check.py  |    46 +
 .../ZOOKEEPER/package/scripts/status_params.py  |    26 +
 .../ZOOKEEPER/package/scripts/zookeeper.py      |   110 +
 .../package/scripts/zookeeper_client.py         |    42 +
 .../package/scripts/zookeeper_server.py         |    54 +
 .../package/scripts/zookeeper_service.py        |    42 +
 .../package/templates/configuration.xsl.j2      |    42 +
 .../ZOOKEEPER/package/templates/zoo.cfg.j2      |    69 +
 .../templates/zookeeper_client_jaas.conf.j2     |    24 +
 .../package/templates/zookeeper_jaas.conf.j2    |    26 +
 .../stacks/BIGTOP/0.8/services/stack_advisor.py |   439 +
 .../stacks/HDP/1.3.2.GlusterFS/metainfo.xml     |    23 -
 .../HDP/1.3.2.GlusterFS/repos/repoinfo.xml      |    40 -
 .../GLUSTERFS/configuration/core-site.xml       |   277 -
 .../GLUSTERFS/configuration/hadoop-policy.xml   |   134 -
 .../GLUSTERFS/configuration/hdfs-site.xml       |   408 -
 .../services/GLUSTERFS/metainfo.xml             |    58 -
 .../GLUSTERFS/package/scripts/glusterfs.py      |    29 -
 .../package/scripts/glusterfs_client.py         |    34 -
 .../GLUSTERFS/package/scripts/params.py         |    29 -
 .../GLUSTERFS/package/scripts/service_check.py  |    37 -
 .../package/templates/glusterfs-env.sh.j2       |    18 -
 .../package/templates/glusterfs.properties.j2   |    36 -
 .../services/HDFS/configuration/core-site.xml   |   253 -
 .../services/HDFS/configuration/global.xml      |   187 -
 .../HDFS/configuration/hadoop-policy.xml        |   134 -
 .../services/HDFS/configuration/hdfs-site.xml   |   439 -
 .../1.3.2.GlusterFS/services/HDFS/metainfo.xml  |    27 -
 .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml |     6 +
 .../1.3.2/services/HIVE/package/scripts/hive.py |    36 +-
 .../package/templates/hadoop-services.cfg.j2    |     2 +
 .../services/HBASE/package/scripts/params.py    |     2 +-
 .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml |     6 +
 .../2.0.6/services/HIVE/package/scripts/hive.py |    31 +-
 .../services/YARN/package/scripts/params.py     |    12 +-
 .../services/STORM/package/scripts/params.py    |    17 +-
 .../2.1/services/STORM/package/scripts/storm.py |    19 +-
 .../STORM/package/scripts/supervisor.py         |     1 -
 .../STORM/package/scripts/yaml_config.py        |    72 -
 .../STORM/package/scripts/yaml_utils.py         |    49 +
 .../STORM/package/templates/storm.yaml.j2       |    60 +
 .../STORM/package/templates/storm_jaas.conf.j2  |    22 +-
 .../stacks/HDP/2.2/services/SLIDER/metainfo.xml |     2 +-
 .../services/SLIDER/package/scripts/params.py   |     9 +-
 .../services/STORM/configuration/storm-site.xml |    38 +-
 .../src/main/resources/stacks/stack_advisor.py  |    17 +-
 .../AmbariManagementControllerTest.java         |     1 +
 .../src/test/python/TestAmbariServer.py         |    54 +
 .../src/test/python/TestStackAdvisor.py         |     9 +-
 .../stacks/1.3.2/HIVE/test_hive_client.py       |    58 +-
 .../stacks/1.3.2/HIVE/test_hive_metastore.py    |    46 +-
 .../stacks/1.3.2/HIVE/test_hive_server.py       |    50 +-
 .../stacks/2.0.6/HIVE/test_hive_client.py       |    78 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |    80 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |    80 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py      |    80 +-
 .../python/stacks/2.1/STORM/test_storm_base.py  |   119 +
 .../stacks/2.1/STORM/test_storm_drpc_server.py  |    90 +-
 .../2.1/STORM/test_storm_jaas_configuration.py  |    77 +
 .../stacks/2.1/STORM/test_storm_nimbus.py       |   105 +-
 .../stacks/2.1/STORM/test_storm_nimbus_prod.py  |    89 +-
 .../2.1/STORM/test_storm_rest_api_service.py    |    87 +-
 .../stacks/2.1/STORM/test_storm_supervisor.py   |    42 +-
 .../2.1/STORM/test_storm_supervisor_prod.py     |    86 +-
 .../stacks/2.1/STORM/test_storm_ui_server.py    |    93 +-
 .../test/python/stacks/2.1/common/hosts.json    |   554 +
 .../test/python/stacks/2.1/common/services.json |  1036 ++
 .../stacks/2.1/common/test_stack_advisor.py     |    41 +-
 .../stacks/2.1/configs/default-storm-start.json |   356 +
 .../stacks/2.1/configs/secured-storm-start.json |   373 +
 .../stacks/2.2/SLIDER/test_slider_client.py     |     8 +-
 .../stacks/HDP/2.0.5/services/HIVE/metainfo.xml |     5 +
 .../stacks/HDP/2.0.7/services/HIVE/metainfo.xml |     3 +
 ambari-web/app/app.js                           |     7 +-
 ambari-web/app/assets/test/test.html            |     1 +
 ambari-web/app/assets/test/tests.js             |     2 -
 ambari-web/app/controllers/application.js       |     4 +
 .../app/controllers/main/admin/repositories.js  |     8 +-
 .../main/admin/security/add/step2.js            |    37 +-
 .../main/admin/security/add/step3.js            |   156 +-
 .../controllers/main/service/info/configs.js    |     8 +-
 .../app/controllers/main/views_controller.js    |     2 +-
 ambari-web/app/data/HDP2.2/site_properties.js   |    29 +
 ambari-web/app/data/HDP2/secure_configs.js      |    16 +-
 ambari-web/app/data/HDP2/secure_properties.js   |   207 +-
 ambari-web/app/data/HDP2/site_properties.js     |    41 +-
 ambari-web/app/messages.js                      |     1 +
 .../app/mixins/wizard/addSecurityConfigs.js     |    35 +-
 ambari-web/app/models/stack_service.js          |    24 +-
 ambari-web/app/router.js                        |    13 +
 ambari-web/app/routes/main.js                   |     3 +-
 ambari-web/app/templates/application.hbs        |     2 +-
 ambari-web/app/utils/config.js                  |    34 +-
 ambari-web/app/utils/string_utils.js            |     4 +-
 ambari-web/app/views/main/menu.js               |    12 +-
 .../main/admin/security/add/step2_test.js       |     4 +-
 .../main/admin/security/add/step3_test.js       |    66 +-
 .../main/admin/security/add/step4_test.js       |    15 +-
 .../test/controllers/main/host/details_test.js  |    25 +-
 .../test/controllers/wizard/step3_test.js       |     4 +-
 .../test/controllers/wizard/step7_test.js       |     3 +
 ambari-web/test/utils/ajax/ajax_test.js         |    11 +-
 ambari-web/test/utils/string_utils_test.js      |     2 +-
 .../widgets/uptime_text_widget_test.js          |    12 +-
 contrib/views/pom.xml                           |     2 +-
 contrib/views/slider/docs/index.md              |     2 +-
 .../view/slider/SliderAppsViewController.java   |    12 +-
 .../assets/data/resource/slider-properties.json |    12 +-
 .../ui/app/assets/javascripts/ember-qunit.js    |   266 +
 .../ui/app/assets/javascripts/qunit.js          |  2495 +++
 .../ui/app/assets/javascripts/tests.js          |    29 +
 .../ui/app/assets/stylesheets/qunit.css         |   237 +
 .../src/main/resources/ui/app/assets/tests.html |    43 +
 .../src/main/resources/ui/app/config/app.js     |     3 +-
 .../ui/app/controllers/slider_app_controller.js |     2 +-
 .../ui/app/controllers/slider_controller.js     |     2 +-
 .../src/main/resources/ui/app/helpers/ajax.js   |     8 +-
 .../src/main/resources/ui/app/helpers/helper.js |    17 +-
 .../src/main/resources/ui/app/initialize.js     |    10 +-
 .../ui/app/mappers/slider_apps_mapper.js        |     2 +-
 .../main/resources/ui/app/models/slider_app.js  |     3 -
 .../src/main/resources/ui/app/routes/main.js    |    17 +-
 .../src/main/resources/ui/app/styles/app.less   |     4 +-
 .../ui/app/templates/slider_app/configs.hbs     |    32 +-
 .../ui/app/templates/slider_app/flex_popup.hbs  |    25 +-
 .../src/main/resources/ui/app/translations.js   |     4 +-
 .../resources/ui/app/views/common/chart_view.js |     6 +-
 .../ui/app/views/slider_app/configs_view.js     |     7 +-
 .../views/slider_app/metrics/app_metric_view.js |     6 +-
 .../slider/src/main/resources/ui/config.js      |     3 +-
 .../ui/test/demo/demo_integration_test.js       |    24 -
 .../resources/ui/test/demo/demo_unit_test.js    |    21 -
 .../src/main/resources/ui/test/helpers.js       |    34 -
 .../ui/test/integration/pages/index_test.js     |    61 +
 .../createAppWizard/step1_controller_test.js    |    39 +
 .../unit/models/slider_app_component_test.js    |    51 +
 .../ui/test/unit/models/slider_app_test.js      |    93 +
 .../views/slider/src/main/resources/view.xml    |    33 +-
 pom.xml                                         |     8 +-
 439 files changed, 66680 insertions(+), 3668 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9398f0/ambari-server/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9398f0/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9398f0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9398f0/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------

Reply via email to