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/05/08 14:03:13 UTC
[22/22] 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/15c04ed5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/15c04ed5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/15c04ed5
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 15c04ed5360e542e1f7c059e28a544f18ded3ae6
Parents: f65692a e74d4f3
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon May 8 10:02:22 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon May 8 10:02:22 2017 -0400
----------------------------------------------------------------------
.../src/main/python/ambari_agent/HostInfo.py | 15 +-
.../python/resource_management/TestScript.py | 56 +-
.../functions/setup_ranger_plugin_xml.py | 26 +-
.../server/configuration/Configuration.java | 5 +
.../ambari/server/controller/AmbariServer.java | 2 +-
.../BlueprintConfigurationProcessor.java | 56 +-
.../AmbariPamAuthenticationProvider.java | 7 +
.../server/state/ValueAttributesInfo.java | 2 +-
.../src/main/python/azuredb_create_generator.py | 22 +-
.../ATLAS/0.7.0.2.5/role_command_order.json | 2 +-
.../package/alerts/alert_llap_app_status.py | 4 +-
.../package/scripts/hive_server_interactive.py | 7 +-
.../HIVE/2.1.0.3.0/service_advisor.py | 7 +
.../KAFKA/0.10.0.3.0/alerts.json | 32 ++
.../0.10.0.3.0/configuration/kafka-broker.xml | 569 +++++++++++++++++++
.../0.10.0.3.0/configuration/kafka-env.xml | 111 ++++
.../0.10.0.3.0/configuration/kafka-log4j.xml | 170 ++++++
.../configuration/kafka_client_jaas_conf.xml | 41 ++
.../configuration/kafka_jaas_conf.xml | 59 ++
.../configuration/ranger-kafka-audit.xml | 130 +++++
.../ranger-kafka-plugin-properties.xml | 148 +++++
.../ranger-kafka-policymgr-ssl.xml | 66 +++
.../configuration/ranger-kafka-security.xml | 64 +++
.../KAFKA/0.10.0.3.0/kerberos.json | 76 +++
.../KAFKA/0.10.0.3.0/metainfo.xml | 109 ++++
.../KAFKA/0.10.0.3.0/metrics.json | 239 ++++++++
.../KAFKA/0.10.0.3.0/package/scripts/kafka.py | 276 +++++++++
.../0.10.0.3.0/package/scripts/kafka_broker.py | 151 +++++
.../KAFKA/0.10.0.3.0/package/scripts/params.py | 341 +++++++++++
.../0.10.0.3.0/package/scripts/service_check.py | 65 +++
.../package/scripts/setup_ranger_kafka.py | 90 +++
.../0.10.0.3.0/package/scripts/status_params.py | 26 +
.../KAFKA/0.10.0.3.0/package/scripts/upgrade.py | 78 +++
.../KAFKA/0.10.0.3.0/package/scripts/utils.py | 38 ++
.../templates/input.config-kafka.json.j2 | 92 +++
.../0.10.0.3.0/package/templates/kafka.conf.j2 | 35 ++
.../package/templates/kafka_client_jaas.conf.j2 | 29 +
.../package/templates/kafka_jaas.conf.j2 | 41 ++
.../package/templates/tools-log4j.properties.j2 | 21 +
.../KAFKA/0.10.0.3.0/role_command_order.json | 7 +
.../KAFKA/0.10.0.3.0/service_advisor.py | 363 ++++++++++++
.../KAFKA/0.10.0.3.0/widgets.json | 182 ++++++
.../0.4.0/package/scripts/setup_ranger_xml.py | 119 ++--
.../RANGER/0.7.0/configuration/ranger-env.xml | 22 +
.../0.7.0/properties/ranger-solrconfig.xml.j2 | 9 +-
.../RANGER/0.7.0/themes/theme_version_5.json | 26 +
.../stacks/HDP/2.3/services/stack_advisor.py | 27 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 68 +--
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 68 +--
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 67 ++-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 67 ++-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 68 +--
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 68 +--
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 68 +--
.../HDP/2.5/upgrades/host-upgrade-2.5.xml | 50 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 68 +--
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 68 +--
.../stacks/HDP/2.6/services/stack_advisor.py | 4 +-
.../HDP/2.6/upgrades/host-upgrade-2.6.xml | 48 +-
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 68 +--
.../stacks/HDP/3.0/services/KAFKA/metainfo.xml | 27 +
.../render/ClusterBlueprintRendererTest.java | 38 +-
.../BlueprintConfigurationProcessorTest.java | 56 +-
.../AmbariPamAuthenticationProviderTest.java | 3 +
.../server/upgrade/UpgradeCatalog252Test.java | 18 +-
ambari-server/src/test/python/unitTests.py | 2 +-
ambari-web/app/routes/main.js | 2 +-
.../widgets/slider_config_widget_view.js | 11 +-
.../app/views/common/quick_view_link_view.js | 7 +-
ambari-web/app/views/main/admin.js | 2 +-
ambari-web/app/views/main/menu.js | 2 +-
.../widgets/slider_config_widget_view_test.js | 13 +
.../test/views/common/quick_link_view_test.js | 2 +-
.../org/apache/ambari/storm/ProxyServlet.java | 12 +-
.../src/main/resources/scripts/router/Router.js | 6 +-
.../src/main/resources/scripts/utils/Utils.js | 25 -
contrib/views/storm/src/main/resources/view.xml | 8 +-
77 files changed, 4505 insertions(+), 572 deletions(-)
----------------------------------------------------------------------