You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2017/05/19 03:35:36 UTC
[13/13] ambari git commit: Merge remote-tracking branch
'origin/trunk' into branch-feature-AMBARI-14714
Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d35ea356
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d35ea356
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d35ea356
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: d35ea356030eab2b7a75614ef2091f21636293d6
Parents: 922f308 71ed281
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu May 18 20:35:04 2017 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu May 18 20:35:04 2017 -0700
----------------------------------------------------------------------
.../libraries/functions/conf_select.py | 13 +-
.../ambari-metrics-host-aggregator/pom.xml | 4 +-
.../STORM/0.9.1/configuration/storm-env.xml | 11 +
.../common-services/STORM/1.0.1.3.0/alerts.json | 145 +++
.../configuration/ranger-storm-audit.xml | 133 ++
.../ranger-storm-plugin-properties.xml | 121 ++
.../ranger-storm-policymgr-ssl.xml | 70 +
.../configuration/ranger-storm-security.xml | 67 +
.../storm-atlas-application.properties.xml | 31 +
.../configuration/storm-cluster-log4j.xml | 133 ++
.../STORM/1.0.1.3.0/configuration/storm-env.xml | 165 +++
.../1.0.1.3.0/configuration/storm-site.xml | 1002 +++++++++++++++
.../configuration/storm-worker-log4j.xml | 189 +++
.../STORM/1.0.1.3.0/kerberos.json | 134 ++
.../STORM/1.0.1.3.0/metainfo.xml | 179 +++
.../STORM/1.0.1.3.0/metrics.json | 1202 ++++++++++++++++++
.../alerts/check_supervisor_process_win.py | 50 +
.../STORM/1.0.1.3.0/package/files/wordCount.jar | Bin 0 -> 690588 bytes
.../1.0.1.3.0/package/scripts/drpc_server.py | 91 ++
.../STORM/1.0.1.3.0/package/scripts/nimbus.py | 116 ++
.../1.0.1.3.0/package/scripts/nimbus_prod.py | 81 ++
.../1.0.1.3.0/package/scripts/pacemaker.py | 90 ++
.../STORM/1.0.1.3.0/package/scripts/params.py | 28 +
.../1.0.1.3.0/package/scripts/params_linux.py | 424 ++++++
.../1.0.1.3.0/package/scripts/params_windows.py | 60 +
.../STORM/1.0.1.3.0/package/scripts/rest_api.py | 85 ++
.../STORM/1.0.1.3.0/package/scripts/service.py | 95 ++
.../1.0.1.3.0/package/scripts/service_check.py | 79 ++
.../package/scripts/setup_ranger_storm.py | 133 ++
.../1.0.1.3.0/package/scripts/status_params.py | 83 ++
.../STORM/1.0.1.3.0/package/scripts/storm.py | 182 +++
.../1.0.1.3.0/package/scripts/storm_upgrade.py | 177 +++
.../package/scripts/storm_yaml_utils.py | 53 +
.../1.0.1.3.0/package/scripts/supervisor.py | 117 ++
.../package/scripts/supervisor_prod.py | 84 ++
.../package/scripts/supervisord_service.py | 33 +
.../1.0.1.3.0/package/scripts/ui_server.py | 137 ++
.../package/templates/client_jaas.conf.j2 | 33 +
.../1.0.1.3.0/package/templates/config.yaml.j2 | 75 ++
.../templates/input.config-storm.json.j2 | 78 ++
.../templates/storm-metrics2.properties.j2 | 34 +
.../1.0.1.3.0/package/templates/storm.conf.j2 | 35 +
.../package/templates/storm_jaas.conf.j2 | 65 +
.../package/templates/worker-launcher.cfg.j2 | 19 +
.../STORM/1.0.1.3.0/quicklinks/quicklinks.json | 45 +
.../STORM/1.0.1.3.0/role_command_order.json | 13 +
.../STORM/1.0.1.3.0/service_advisor.py | 387 ++++++
.../STORM/1.0.1.3.0/widgets.json | 127 ++
.../STORM/1.1.0/configuration/storm-site.xml | 44 +
.../common-services/STORM/1.1.0/kerberos.json | 138 ++
.../common-services/STORM/1.1.0/metainfo.xml | 44 +
.../stacks/HDP/2.6/services/STORM/metainfo.xml | 4 +
.../stacks/HDP/3.0/services/STORM/metainfo.xml | 27 +
ambari-web/app/controllers/installer.js | 15 -
.../journalNode/step1_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller.js | 7 +-
.../service/manage_config_groups_controller.js | 89 +-
ambari-web/app/controllers/wizard.js | 38 +-
.../wizard/step7/assign_master_controller.js | 16 +-
.../mixins/wizard/assign_master_components.js | 77 +-
.../app/mixins/wizard/wizardHostsLoading.js | 6 +-
ambari-web/app/routes/add_service_routes.js | 1 +
ambari-web/app/routes/installer.js | 1 +
ambari-web/app/utils/ajax/ajax.js | 8 +-
.../common/assign_master_components_view.js | 4 +
.../app/views/main/service/reassign_view.js | 4 -
ambari-web/test/controllers/installer_test.js | 12 -
.../journalNode/step1_controller_test.js | 4 +-
.../admin/stack_and_upgrade_controller_test.js | 6 -
.../main/service/add_controller_test.js | 54 +-
.../test/controllers/wizard/step5_test.js | 86 +-
ambari-web/test/controllers/wizard_test.js | 30 +-
.../resourceManager/wizard_view_test.js | 18 +-
.../views/main/service/reassign_view_test.js | 12 -
.../resources/ui/hive-web/app/routes/splash.js | 2 +-
.../ambari/storm/StormDetailsServlet.java | 81 ++
.../storm/src/main/resources/WEB-INF/web.xml | 8 +
.../resources/scripts/components/SearchLogs.jsx | 38 +-
78 files changed, 7310 insertions(+), 274 deletions(-)
----------------------------------------------------------------------