ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [28/28] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Fri, 03 Mar 2017 18:04:15 GMT
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/4527aa15
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4527aa15
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4527aa15

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 4527aa15d2b7f184072d4da4402fd487a6d75c13
Parents: ef96465 a28e0ca
Author: Nate Cole <ncole@hortonworks.com>
Authored: Fri Mar 3 13:03:40 2017 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Fri Mar 3 13:03:40 2017 -0500

----------------------------------------------------------------------
 .../server/actionmanager/ActionDBAccessor.java  |   4 +-
 .../actionmanager/ActionDBAccessorImpl.java     |  11 +-
 .../server/actionmanager/ActionScheduler.java   |  30 +-
 .../alerts/AmbariPerformanceRunnable.java       |  11 +-
 .../ambari/server/checks/CheckDescription.java  |   3 +-
 .../ambari/server/topology/LogicalRequest.java  |   5 +-
 .../server/upgrade/UpgradeCatalog250.java       |   9 +-
 .../configuration/application-properties.xml    |   8 +-
 .../0.12.0.2.0/package/scripts/hive_server.py   |   1 -
 .../0.12.0.2.0/package/scripts/params_linux.py  |   1 -
 .../configuration/logsearch-properties.xml      |   6 +-
 .../LOGSEARCH/0.5.0/metainfo.xml                |   1 +
 .../common-services/SPARK2/2.0.0/alerts.json    |   2 +-
 .../2.0.0/package/scripts/spark_service.py      |   2 +
 .../YARN/3.0.0.3.0/service_advisor.py           |  99 ++++--
 .../HIVE/configuration/llap-daemon-log4j.xml    |   9 +-
 .../stacks/HDP/2.5/services/HIVE/metainfo.xml   |   2 +-
 .../stacks/HDP/2.5/services/OOZIE/metainfo.xml  |   2 +-
 .../stacks/HDP/2.5/services/stack_advisor.py    |  38 ++-
 .../HIVE/configuration/tez-interactive-site.xml |  10 +-
 .../actionmanager/TestActionScheduler.java      |  51 ++-
 .../checks/AutoStartDisabledCheckTest.java      |   7 +
 .../server/topology/LogicalRequestTest.java     | 122 +++++++
 .../stacks/2.5/common/test_stack_advisor.py     |  58 +++-
 ambari-web/app/controllers/main/service/item.js |  22 +-
 .../app/controllers/wizard/step4_controller.js  |   2 +
 .../mixins/common/configs/configs_comparator.js |  14 +-
 .../configs/objects/service_config_property.js  |   7 +
 .../common/configs/service_config_category.hbs  |   5 +-
 ambari-web/app/utils/config.js                  |   3 +-
 .../views/common/configs/config_history_flow.js |   3 +
 .../service/widgets/create/expression_view.js   |   2 +-
 .../test/controllers/main/service/item_test.js  |  71 ++++
 ambari-web/test/views/common/table_view_test.js |   1 -
 .../historyqueryset/MysqlQuerySetAmbariDB.java  |   4 +-
 .../historyqueryset/OracleQuerySetAmbariDB.java |   4 +-
 .../hive/historyqueryset/QuerySetAmbariDB.java  |  14 +-
 .../historyqueryset/OracleQuerySetHueDB.java    |  16 +-
 .../hive/historyqueryset/QuerySetHueDB.java     |  16 +-
 .../HiveHistoryMigrationUtility.java            |   2 +-
 ...HiveHistoryQueryMigrationImplementation.java |  10 +-
 .../resources/scripts/models/HiveModel.java     |  33 ++
 .../app/routes/home-page/hive-history.js        |  15 +-
 .../app/routes/home-page/hive-saved-query.js    |  14 +
 .../app/routes/home-page/pig-job.js             |  15 +-
 .../app/routes/home-page/pig-script.js          |  14 +
 .../app/routes/home-page/pig-udf.js             |  15 +-
 .../templates/home-page/hive-saved-query.hbs    |   2 +-
 .../app/templates/home-page/pig-job.hbs         |   2 +-
 .../app/templates/home-page/pig-script.hbs      |   2 +-
 .../app/templates/home-page/pig-udf.hbs         |   2 +-
 contrib/views/wfmanager/pom.xml                 |  24 +-
 .../ambari/view/OozieProxyImpersonator.java     |  26 +-
 .../oozie/ambari/view/assets/AssetResource.java |  41 ++-
 .../ambari/view/exception/WfmWebException.java  |  12 +-
 .../WorkflowsManagerResource.java               |  11 +-
 .../ui/app/components/decision-add-branch.js    |   5 +-
 .../ui/app/components/decision-config.js        |  10 +-
 .../ui/app/components/flow-designer.js          |  33 +-
 .../ui/app/components/transition-config.js      |   3 +
 .../ui/app/components/workflow-action-editor.js |  35 +-
 .../ui/app/domain/actionjob_hanlder.js          | 330 +++++++++----------
 .../ui/app/domain/cytoscape-flow-renderer.js    |   7 +-
 .../resources/ui/app/domain/node-handler.js     |   4 +-
 .../src/main/resources/ui/app/domain/node.js    |   7 +-
 .../ui/app/domain/workflow-importer.js          |  10 +-
 .../ui/app/domain/workflow-xml-generator.js     |   2 +-
 .../main/resources/ui/app/domain/workflow.js    |   2 +-
 .../templates/components/decision-config.hbs    |   8 +-
 .../app/templates/components/flow-designer.hbs  |   4 +-
 .../templates/components/transition-config.hbs  |   5 +
 .../components/workflow-action-editor.hbs       |   2 +-
 .../resources/ui/app/validators/workflow-dag.js |  43 +++
 .../wfmanager/src/main/resources/ui/bower.json  |  26 +-
 74 files changed, 1003 insertions(+), 449 deletions(-)
----------------------------------------------------------------------



Mime
View raw message