You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/27 20:20:12 UTC
[25/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/535327d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/535327d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/535327d1
Branch: refs/heads/trunk
Commit: 535327d12f2b3b44553f0f1aec34b87515a0e20b
Parents: 42b8dcf 9963ac8
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Jan 27 13:17:01 2017 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Jan 27 13:17:01 2017 -0500
----------------------------------------------------------------------
.../controllers/clusters/UserAccessListCtrl.js | 16 +-
.../main/python/ambari_agent/PythonExecutor.py | 2 +-
.../resource_management/TestPackagesAnalyzer.py | 46 +
.../ambari_commons/ambari_metrics_helper.py | 9 +-
.../libraries/functions/get_stack_version.py | 2 +-
.../libraries/functions/hive_check.py | 13 +-
.../libraries/functions/packages_analyzer.py | 2 +-
.../libraries/functions/version_select_util.py | 5 +-
.../timeline/AbstractTimelineMetricsSink.java | 1 +
.../kafka/KafkaTimelineMetricsReporter.java | 32 +-
.../kafka/KafkaTimelineMetricsReporterTest.java | 26 +
.../storm/StormTimelineMetricsReporter.java | 9 +-
.../storm/StormTimelineMetricsReporter.java | 5 +-
.../sink/storm/StormTimelineMetricsSink.java | 6 +-
ambari-server/conf/unix/ambari.properties | 4 +-
.../commands/StackAdvisorCommand.java | 6 +-
.../AmbariManagementControllerImpl.java | 21 +-
.../BlueprintConfigurationProcessor.java | 1 +
.../StackDependencyResourceProvider.java | 8 +
.../UpdateKerberosConfigsServerAction.java | 17 +
.../server/state/DependencyConditionInfo.java | 13 +
.../server/state/ServiceComponentImpl.java | 1 +
.../main/python/ambari_server/serverSetup.py | 4 +-
.../HDP/grafana-hdfs-topn.json | 20 +-
.../package/scripts/metadata_server.py | 13 +-
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 4 +
.../DRUID/0.9.2/configuration/druid-router.xml | 2 +-
.../HDFS/3.0.0.3.0/service_advisor.py | 4 -
.../alert_hive_interactive_thrift_port.py | 15 +-
.../package/alerts/alert_hive_thrift_port.py | 15 +-
.../package/scripts/hive_server_interactive.py | 186 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 7 +
.../scripts/setup_ranger_hive_interactive.py | 6 +-
.../0.7.0/configuration/ranger-ugsync-site.xml | 33 +
.../common-services/YARN/3.0.0.3.0/metainfo.xml | 73 +-
.../YARN/3.0.0.3.0/service_advisor.py | 1789 ++++++++++++++++++
.../src/main/resources/properties.json | 1 +
.../stacks/HDP/2.0.6/services/stack_advisor.py | 343 +---
.../stacks/HDP/2.1/services/stack_advisor.py | 19 +-
.../stacks/HDP/2.2/services/stack_advisor.py | 1 -
.../stacks/HDP/2.3/services/stack_advisor.py | 43 +-
.../services/HIVE/configuration/hive-env.xml | 36 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 70 +-
.../stacks/HDP/2.6/services/ATLAS/kerberos.json | 97 +
.../services/HIVE/configuration/hive-env.xml | 2 +-
.../HIVE/configuration/hive-interactive-env.xml | 13 +
.../stacks/HDP/2.6/services/stack_advisor.py | 36 +-
.../stacks/HDP/3.0/role_command_order.json | 27 +-
.../stacks/HDP/3.0/services/YARN/metainfo.xml | 3 +-
.../src/main/resources/stacks/stack_advisor.py | 350 +++-
.../BlueprintConfigurationProcessorTest.java | 3 +
.../UpdateKerberosConfigsServerActionTest.java | 39 +-
.../src/test/python/TestVersionSelectUtil.py | 40 +
.../services-master_ambari_colo-3-hosts.json | 33 +-
.../services-master_standby_colo-3-hosts.json | 33 +-
.../configs/services-normal-hawq-3-hosts.json | 33 +-
.../configs/services-normal-nohawq-3-hosts.json | 10 +-
.../services-standby_ambari_colo-3-hosts.json | 33 +-
.../2.0.6/HIVE/test_hive_service_check.py | 10 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 107 +-
.../2.3/common/services-sparkts-hive.json | 102 +-
.../stacks/2.3/common/services-sparkts.json | 77 +-
.../stacks/2.3/common/test_stack_advisor.py | 2 +-
.../stacks/2.5/HIVE/test_hive_server_int.py | 421 ++++-
.../2.5/common/services-normal-his-2-hosts.json | 114 +-
.../2.5/configs/hsi_default_for_restart.json | 1256 ++++++++++++
.../stacks/2.6/common/test_stack_advisor.py | 67 +
.../mixins/common/configs/enhanced_configs.js | 22 +-
ambari-web/app/routes/main.js | 5 +-
ambari-web/app/styles/application.less | 66 +-
ambari-web/app/styles/common.less | 6 +-
.../common/configs/config_history_flow.hbs | 2 +-
.../common/configs/service_version_box.hbs | 2 +-
.../modal_popups/dependent_configs_list.hbs | 91 +-
.../modal_popups/dependent_configs_table.hbs | 72 +
ambari-web/app/utils/helper.js | 1 +
ambari-web/app/views/common/modal_popup.js | 1 +
.../dependent_configs_list_popup.js | 19 +
ambari-web/test/utils/helper_test.js | 2 +
contrib/utils/perf/deploy-gce-perf-cluster.py | 4 +-
.../resources/system/ranger/RangerService.java | 41 +-
.../src/main/resources/ui/app/adapters/table.js | 27 +-
.../resources/ui/app/components/query-editor.js | 8 -
.../ui/app/components/table-statistics.js | 120 ++
.../main/resources/ui/app/models/table-info.js | 1 +
.../routes/databases/database/tables/table.js | 4 +
.../src/main/resources/ui/app/services/jobs.js | 10 +-
.../resources/ui/app/services/stats-service.js | 76 +
.../src/main/resources/ui/app/styles/app.scss | 32 +-
.../templates/components/table-statistics.hbs | 153 ++
.../app/templates/databases/database/tables.hbs | 2 +-
.../databases/database/tables/table/auth.hbs | 10 +-
.../databases/database/tables/table/stats.hbs | 4 +-
.../hive20/src/main/resources/ui/bower.json | 1 -
.../hive20/src/main/resources/ui/package.json | 1 -
.../resources/libs/dagre-d3/dagre-d3.min.js | 28 +
.../resources/scripts/components/BarChart.jsx | 34 +-
.../scripts/components/TopologyGraph.jsx | 292 ++-
.../storm/src/main/resources/scripts/main.js | 7 +-
.../scripts/views/TopologyDetailView.jsx | 39 +-
.../storm/src/main/resources/styles/style.css | 20 +
.../org/apache/oozie/ambari/view/Constants.java | 4 +-
.../ambari/view/OozieProxyImpersonator.java | 56 +-
.../oozie/ambari/view/WorkflowFileInfo.java | 6 +-
.../oozie/ambari/view/WorkflowFilesService.java | 64 +-
.../workflowmanager/WorkflowManagerService.java | 10 +-
.../ui/app/components/bundle-config.js | 80 +-
.../resources/ui/app/components/coord-config.js | 110 +-
.../ui/app/components/designer-workspace.js | 27 +-
.../ui/app/components/flow-designer.js | 92 +-
.../ui/app/components/prepare-config-fs.js | 4 +-
.../main/resources/ui/app/components/save-wf.js | 4 +-
.../main/resources/ui/app/controllers/index.js | 39 +
.../ui/app/domain/cytoscape-flow-renderer.js | 2 +-
.../src/main/resources/ui/app/domain/node.js | 45 +-
.../main/resources/ui/app/domain/workflow.js | 2 +-
.../src/main/resources/ui/app/routes/index.js | 90 +-
.../main/resources/ui/app/services/user-info.js | 56 +
.../ui/app/services/workspace-manager.js | 64 +-
.../app/templates/components/bundle-config.hbs | 4 +-
.../app/templates/components/coord-config.hbs | 2 +-
.../app/templates/components/flow-designer.hbs | 2 +-
.../ui/app/templates/design-loading.hbs | 26 +
.../main/resources/ui/app/templates/index.hbs | 74 +
.../main/resources/ui/app/templates/loading.hbs | 26 -
.../ui/tests/unit/services/user-info-test.js | 29 +
126 files changed, 6562 insertions(+), 1396 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/535327d1/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/535327d1/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------