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:17 UTC

[30/50] [abbrv] 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/0c3478b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c3478b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c3478b1

Branch: refs/heads/trunk
Commit: 0c3478b1cc98a3738bca05d12a38be87e8711f5b
Parents: 36620ba 4307f9b
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Feb 21 11:39:23 2017 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Feb 21 11:39:23 2017 -0500

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/main.py        |  23 +
 ambari-server/docs/api/v1/schemas.md            |   2 +-
 .../ATLAS/0.1.0.2.3/kerberos.json               |   3 +
 .../DRUID/0.9.2/package/scripts/params.py       |   2 +-
 .../0.5.0.2.2/configuration/gateway-site.xml    |   6 +
 .../0.5.0.2.2/package/scripts/params_linux.py   |  11 +
 .../SPARK2/2.0.0/package/scripts/params.py      |   2 +
 .../2.0.0/package/scripts/service_check.py      |   4 +-
 .../before-ANY/scripts/shared_initialization.py |   4 +
 .../stacks/HDP/2.2/services/stack_advisor.py    |   7 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |   2 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |   5 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   6 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |   2 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |   5 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   6 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |   2 +
 .../HIVE/configuration/hive-interactive-env.xml |   2 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  17 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  20 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |   5 +-
 .../stacks/HDP/2.6/services/ATLAS/kerberos.json |   3 +
 .../services/KNOX/configuration/topology.xml    |  10 +
 .../stacks/HDP/2.6/services/stack_advisor.py    |   4 +-
 .../2.0.6/hooks/before-ANY/test_before_any.py   |   3 +
 .../stacks/2.2/common/test_stack_advisor.py     |   1 -
 .../stacks/2.3/common/test_stack_advisor.py     |   2 -
 ambari-web/app/styles/application.less          |   8 +-
 ambari-web/app/styles/wizard.less               |   8 +
 .../common/assign_master_components.hbs         |   5 +-
 .../app/templates/common/form/dropdown.hbs      |  29 +
 ambari-web/app/views.js                         |   1 +
 .../common/assign_master_components_view.js     |   5 +-
 .../views/common/configs/service_config_view.js |   1 +
 ambari-web/app/views/common/form/dropdown.js    |  84 +++
 .../src/main/resources/ui/app/adapters/query.js |   6 +-
 .../ui/app/components/query-result-table.js     |  30 +-
 .../resources/ui/app/components/upload-table.js |   2 +-
 .../ui/app/components/visual-explain.js         |  29 +-
 .../resources/ui/app/configs/result-tabs.js     |  48 ++
 .../resources/ui/app/helpers/extract-value.js   |  27 +
 .../resources/ui/app/mixins/table-common.js     |  86 ---
 .../main/resources/ui/app/mixins/ui-logger.js   |   9 +
 .../main/resources/ui/app/models/worksheet.js   |   8 +-
 .../hive20/src/main/resources/ui/app/router.js  |   6 +-
 .../databases/database/tables/upload-table.js   |  41 +-
 .../resources/ui/app/routes/queries/query.js    | 452 ++++++-------
 .../ui/app/routes/queries/query/loading.js      |  24 +
 .../ui/app/routes/queries/query/log.js          | 104 +++
 .../ui/app/routes/queries/query/results.js      |  59 ++
 .../ui/app/routes/queries/query/tez-ui.js       |  45 ++
 .../app/routes/queries/query/visual-explain.js  |  56 ++
 .../main/resources/ui/app/routes/udfs/new.js    |  71 +-
 .../resources/ui/app/services/alert-messages.js |   7 +-
 .../src/main/resources/ui/app/services/query.js |   4 +-
 .../src/main/resources/ui/app/styles/app.scss   | 247 +++----
 .../ui/app/templates/components/column-item.hbs |   4 +-
 .../templates/components/query-result-table.hbs |  79 ++-
 .../app/templates/components/upload-table.hbs   |   4 +-
 .../app/templates/components/visual-explain.hbs |   1 -
 .../ui/app/templates/queries/query.hbs          |  64 +-
 .../ui/app/templates/queries/query/loading.hbs  |  21 +
 .../ui/app/templates/queries/query/log.hbs      |  29 +
 .../ui/app/templates/queries/query/results.hbs  |  49 ++
 .../ui/app/templates/queries/query/tez-ui.hbs   |  19 +
 .../templates/queries/query/visual-explain.hbs  |  33 +
 .../resources/ui/app/utils/hive-explainer.js    | 645 -------------------
 .../ui/app/utils/hive-explainer/enhancer.js     |  37 ++
 .../ui/app/utils/hive-explainer/fallback.js     |  34 +
 .../ui/app/utils/hive-explainer/index.js        |  31 +
 .../ui/app/utils/hive-explainer/processor.js    | 240 +++++++
 .../app/utils/hive-explainer/renderer-force.js  | 325 ++++++++++
 .../ui/app/utils/hive-explainer/renderer.js     | 327 ++++++++++
 .../ui/app/utils/hive-explainer/transformer.js  | 445 +++++++++++++
 .../hive20/src/main/resources/ui/bower.json     |   3 +-
 .../src/main/resources/ui/config/environment.js |   2 +-
 .../src/main/resources/ui/ember-cli-build.js    |   1 +
 .../hive20/src/main/resources/ui/package.json   |   1 -
 .../ambari/view/OozieProxyImpersonator.java     | 192 +++---
 .../apache/oozie/ambari/view/OozieUtils.java    |  18 +
 .../org/apache/oozie/ambari/view/Utils.java     |  14 +-
 .../oozie/ambari/view/WorkflowFilesService.java |  22 +-
 .../workflowmanager/WorkflowManagerService.java |   6 +-
 .../WorkflowsManagerResource.java               |   7 +-
 .../view/workflowmanager/WorkflowsRepo.java     |  40 +-
 .../ui/app/components/bundle-config.js          |  18 +-
 .../resources/ui/app/components/coord-config.js |   6 +-
 .../ui/app/components/flow-designer.js          |  36 +-
 .../resources/ui/app/components/hdfs-browser.js |   9 +
 .../main/resources/ui/app/components/job-row.js |   6 +
 .../main/resources/ui/app/components/save-wf.js |  11 +-
 .../ui/app/components/search-create-new-bar.js  |   2 +-
 .../resources/ui/app/components/search-table.js |  17 +-
 .../ui/app/domain/cytoscape-flow-renderer.js    |  34 +-
 .../ui/app/domain/workflow-xml-generator.js     |   4 -
 .../main/resources/ui/app/domain/workflow.js    |   1 +
 .../app/templates/components/bundle-config.hbs  |   2 +-
 .../app/templates/components/hdfs-browser.hbs   |   5 +
 .../ui/app/templates/components/job-config.hbs  |  37 +-
 .../app/templates/components/search-table.hbs   |  11 +-
 100 files changed, 2994 insertions(+), 1559 deletions(-)
----------------------------------------------------------------------