You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/04/24 02:21:27 UTC

[45/45] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556

Merge branch 'trunk' into branch-feature-AMBARI-12556


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: c8858af27daa31bcfc1bef92f6630483c6a1dc41
Parents: a33040a e5fff58
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Sun Apr 23 22:19:59 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Sun Apr 23 22:19:59 2017 -0400

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/ActionQueue.py |    9 +-
 .../ambari_agent/CustomServiceOrchestrator.py   |   33 +-
 .../test/python/ambari_agent/TestActionQueue.py |   13 +-
 .../TestCustomServiceOrchestrator.py            |   51 -
 .../libraries/script/script.py                  |   16 -
 .../ambari/logfeeder/output/OutputManager.java  |    2 +-
 .../ambari/server/agent/ComponentStatus.java    |   28 +-
 .../ambari/server/agent/HeartbeatProcessor.java |   20 -
 .../ambari/server/topology/AmbariContext.java   |    3 +
 .../package/scripts/accumulo_script.py          |   50 -
 .../0.1.0/package/scripts/metrics_collector.py  |   66 +-
 .../package/scripts/metadata_server.py          |   78 -
 .../0.5.0.2.1/package/scripts/falcon_client.py  |   10 -
 .../0.5.0.2.1/package/scripts/falcon_server.py  |   59 -
 .../0.96.0.2.0/package/scripts/hbase_master.py  |   49 -
 .../package/scripts/hbase_regionserver.py       |   49 -
 .../package/scripts/phoenix_queryserver.py      |    6 +-
 .../common-services/HBASE/2.0.0.3.0/alerts.json |  127 +
 .../HBASE/2.0.0.3.0/configuration/hbase-env.xml |  279 ++
 .../2.0.0.3.0/configuration/hbase-log4j.xml     |  188 +
 .../2.0.0.3.0/configuration/hbase-policy.xml    |   53 +
 .../2.0.0.3.0/configuration/hbase-site.xml      |  774 +++
 .../configuration/ranger-hbase-audit.xml        |  132 +
 .../ranger-hbase-plugin-properties.xml          |  135 +
 .../ranger-hbase-policymgr-ssl.xml              |   66 +
 .../configuration/ranger-hbase-security.xml     |   74 +
 .../HBASE/2.0.0.3.0/kerberos.json               |  160 +
 .../HBASE/2.0.0.3.0/metainfo.xml                |  232 +
 .../HBASE/2.0.0.3.0/metrics.json                | 4733 ++++++++++++++++++
 .../2.0.0.3.0/package/files/draining_servers.rb |  164 +
 .../package/files/hbase-smoke-cleanup.sh        |   23 +
 .../2.0.0.3.0/package/files/hbaseSmokeVerify.sh |   34 +
 .../HBASE/2.0.0.3.0/package/scripts/__init__.py |   19 +
 .../2.0.0.3.0/package/scripts/functions.py      |   54 +
 .../HBASE/2.0.0.3.0/package/scripts/hbase.py    |  230 +
 .../2.0.0.3.0/package/scripts/hbase_client.py   |   81 +
 .../package/scripts/hbase_decommission.py       |   94 +
 .../2.0.0.3.0/package/scripts/hbase_master.py   |  163 +
 .../package/scripts/hbase_regionserver.py       |  174 +
 .../2.0.0.3.0/package/scripts/hbase_service.py  |   66 +
 .../2.0.0.3.0/package/scripts/hbase_upgrade.py  |   42 +
 .../HBASE/2.0.0.3.0/package/scripts/params.py   |   28 +
 .../2.0.0.3.0/package/scripts/params_linux.py   |  426 ++
 .../2.0.0.3.0/package/scripts/params_windows.py |   43 +
 .../package/scripts/phoenix_queryserver.py      |   92 +
 .../package/scripts/phoenix_service.py          |   56 +
 .../2.0.0.3.0/package/scripts/service_check.py  |   99 +
 .../package/scripts/setup_ranger_hbase.py       |  106 +
 .../2.0.0.3.0/package/scripts/status_params.py  |   68 +
 .../HBASE/2.0.0.3.0/package/scripts/upgrade.py  |  106 +
 .../package/templates/hbase-smoke.sh.j2         |   44 +
 .../2.0.0.3.0/package/templates/hbase.conf.j2   |   35 +
 .../package/templates/hbase_client_jaas.conf.j2 |   23 +
 .../templates/hbase_grant_permissions.j2        |   39 +
 .../package/templates/hbase_master_jaas.conf.j2 |   26 +
 .../templates/hbase_queryserver_jaas.conf.j2    |   26 +
 .../templates/hbase_regionserver_jaas.conf.j2   |   26 +
 .../templates/input.config-hbase.json.j2        |   79 +
 .../package/templates/regionservers.j2          |   20 +
 .../HBASE/2.0.0.3.0/quicklinks/quicklinks.json  |   97 +
 .../HBASE/2.0.0.3.0/role_command_order.json     |   10 +
 .../HBASE/2.0.0.3.0/themes/theme.json           |  407 ++
 .../HBASE/2.0.0.3.0/widgets.json                |  510 ++
 .../HDFS/2.1.0.2.0/package/scripts/datanode.py  |   58 -
 .../2.1.0.2.0/package/scripts/hdfs_client.py    |   45 -
 .../2.1.0.2.0/package/scripts/journalnode.py    |   57 -
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |   57 -
 .../2.1.0.2.0/package/scripts/nfsgateway.py     |   58 -
 .../HDFS/2.1.0.2.0/package/scripts/snamenode.py |   60 -
 .../2.1.0.2.0/package/scripts/zkfc_slave.py     |   43 -
 .../HDFS/3.0.0.3.0/package/scripts/datanode.py  |   58 -
 .../3.0.0.3.0/package/scripts/hdfs_client.py    |   45 -
 .../3.0.0.3.0/package/scripts/journalnode.py    |   57 -
 .../HDFS/3.0.0.3.0/package/scripts/namenode.py  |   57 -
 .../3.0.0.3.0/package/scripts/nfsgateway.py     |   58 -
 .../HDFS/3.0.0.3.0/package/scripts/snamenode.py |   60 -
 .../3.0.0.3.0/package/scripts/zkfc_slave.py     |   43 -
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |    1 +
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |   25 +-
 .../package/scripts/hive_metastore.py           |   52 -
 .../0.12.0.2.0/package/scripts/hive_server.py   |   61 -
 .../package/scripts/hive_server_interactive.py  |   61 -
 .../package/scripts/webhcat_server.py           |   67 -
 .../2.1.0.3.0/package/scripts/hive_metastore.py |   52 -
 .../2.1.0.3.0/package/scripts/hive_server.py    |   61 -
 .../package/scripts/hive_server_interactive.py  |   61 -
 .../2.1.0.3.0/package/scripts/webhcat_server.py |   67 -
 .../package/scripts/kerberos_client.py          |   21 -
 .../0.5.0.2.2/package/scripts/knox_gateway.py   |   61 -
 .../4.0.0.2.0/package/scripts/oozie_server.py   |   63 -
 .../STORM/0.9.1/package/scripts/drpc_server.py  |   52 -
 .../STORM/0.9.1/package/scripts/nimbus.py       |   45 -
 .../STORM/0.9.1/package/scripts/pacemaker.py    |   52 -
 .../STORM/0.9.1/package/scripts/ui_server.py    |   53 -
 .../scripts/application_timeline_server.py      |   61 -
 .../2.1.0.2.0/package/scripts/historyserver.py  |   56 -
 .../2.1.0.2.0/package/scripts/nodemanager.py    |   60 -
 .../package/scripts/resourcemanager.py          |   60 -
 .../YARN/3.0.0.3.0/configuration/yarn-site.xml  |   12 +
 .../scripts/application_timeline_server.py      |   61 -
 .../3.0.0.3.0/package/scripts/historyserver.py  |   56 -
 .../3.0.0.3.0/package/scripts/nodemanager.py    |   60 -
 .../package/scripts/resourcemanager.py          |   60 -
 .../YARN/3.0.0.3.0/service_advisor.py           |    4 +
 .../3.4.5/package/scripts/zookeeper_server.py   |   51 -
 .../stacks/HDP/2.1/services/stack_advisor.py    |   11 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |   61 +-
 .../services/YARN/configuration/yarn-site.xml   |   12 +
 .../stacks/HDP/2.6/services/stack_advisor.py    |    5 +
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |   11 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |    4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |    1 +
 .../stacks/HDP/3.0/services/HBASE/metainfo.xml  |   26 +
 .../KERBEROS/package/scripts/kerberos_client.py |   21 -
 .../server/agent/HeartbeatProcessorTest.java    |    7 -
 .../server/agent/TestHeartbeatHandler.java      |   13 -
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |  102 -
 .../2.0.6/HBASE/test_hbase_regionserver.py      |  104 -
 .../python/stacks/2.0.6/HDFS/test_datanode.py   |  111 -
 .../stacks/2.0.6/HDFS/test_hdfs_client.py       |  100 -
 .../stacks/2.0.6/HDFS/test_journalnode.py       |  114 -
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |  114 -
 .../python/stacks/2.0.6/HDFS/test_nfsgateway.py |  116 -
 .../python/stacks/2.0.6/HDFS/test_snamenode.py  |  117 +-
 .../test/python/stacks/2.0.6/HDFS/test_zkfc.py  |  102 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |  112 -
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |  116 -
 .../stacks/2.0.6/OOZIE/test_oozie_server.py     |  113 -
 .../stacks/2.0.6/YARN/test_historyserver.py     |  106 -
 .../stacks/2.0.6/YARN/test_nodemanager.py       |  109 -
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |  108 -
 .../2.0.6/ZOOKEEPER/test_zookeeper_server.py    |  103 -
 .../stacks/2.1/FALCON/test_falcon_client.py     |   24 -
 .../stacks/2.1/FALCON/test_falcon_server.py     |  109 -
 .../stacks/2.1/HIVE/test_hive_metastore.py      |  120 +-
 .../stacks/2.1/STORM/test_storm_drpc_server.py  |  104 -
 .../stacks/2.1/STORM/test_storm_nimbus.py       |  103 -
 .../stacks/2.1/STORM/test_storm_ui_server.py    |   82 -
 .../stacks/2.1/YARN/test_apptimelineserver.py   |  110 -
 .../stacks/2.1/common/test_stack_advisor.py     |    7 +-
 .../python/stacks/2.2/KNOX/test_knox_gateway.py |  102 -
 .../stacks/2.5/ATLAS/test_atlas_server.py       |   42 -
 .../stacks/2.6/common/test_stack_advisor.py     |    9 +-
 .../resources/ui/app/adapters/application.js    |    2 +-
 .../src/main/resources/ui/app/styles/app.scss   |    7 +
 .../ui/app/utils/hive-explainer/renderer.js     |    4 +-
 146 files changed, 10641 insertions(+), 5260 deletions(-)
----------------------------------------------------------------------