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 2016/10/28 17:46:17 UTC
[38/38] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-18634
Merge branch 'trunk' into branch-feature-AMBARI-18634
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99c82166
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99c82166
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99c82166
Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 99c8216635d018ce50b91af121e196fdbf5cf541
Parents: 6088e4f 52cceb7
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Oct 28 13:45:29 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Oct 28 13:45:29 2016 -0400
----------------------------------------------------------------------
.../src/main/python/ambari_agent/ActionQueue.py | 4 +
.../ambari_agent/StatusCommandsExecutor.py | 10 +-
.../libraries/functions/copy_tarball.py | 2 +-
ambari-server/docs/api/v1/configuration.md | 28 +-
ambari-server/docs/api/v1/create-cluster.md | 2 +-
.../docs/api/v1/host-component-resources.md | 2 +-
ambari-server/docs/api/v1/index.md | 6 +-
ambari-server/docs/api/v1/schemas.md | 2 +-
ambari-server/docs/api/v1/update-service.md | 4 +-
ambari-server/docs/api/v1/update-services.md | 2 +-
.../orm/entities/ServiceDesiredStateEntity.java | 22 +
.../org/apache/ambari/server/state/Service.java | 31 +
.../apache/ambari/server/state/ServiceImpl.java | 95 ++
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +
.../resources/Ambari-DDL-Postgres-CREATE.sql | 2 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +
.../HAWQ/2.0.0/role_command_order.json | 11 -
.../PXF/3.0.0/role_command_order.json | 7 -
.../0.6.0.2.5/package/scripts/master.py | 18 +-
.../stacks/HDP/2.3/role_command_order.json | 8 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 1330 ++++++++++++++++
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1167 ++++++++++++++
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 1285 +++++++++++++++
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1124 +++++++++++++
.../configuration/hive-interactive-site.xml | 4 +
.../stacks/HDP/2.5/services/stack_advisor.py | 4 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 1168 ++++++++++++++
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 930 +++++++++++
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 1146 ++++++++++++++
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 930 +++++++++++
.../src/main/resources/upgrade-pack.xsd | 2 +-
.../stacks/2.5/common/test_stack_advisor.py | 63 +
.../main/admin/kerberos/step4_controller.js | 2 +-
.../controllers/main/service/info/summary.js | 4 +
ambari-web/app/messages.js | 2 +
ambari-web/app/styles/application.less | 97 +-
.../app/styles/theme/bootstrap-ambari.css | 175 +-
.../templates/common/configs/overrideWindow.hbs | 10 +-
.../modal_popups/dependent_configs_list.hbs | 4 +-
ambari-web/app/templates/experimental.hbs | 24 +-
.../main/admin/stack_upgrade/services.hbs | 3 +
.../admin/stack_upgrade/upgrade_history.hbs | 45 +-
ambari-web/app/templates/main/alerts.hbs | 25 +-
.../alerts/add_definition_to_group_popup.hbs | 16 +-
.../main/alerts/alert_definitions_actions.hbs | 30 +-
.../main/alerts/definition_details.hbs | 153 +-
.../templates/main/dashboard/config_history.hbs | 3 +
.../main/dashboard/widgets/hbase_links.hbs | 2 +-
.../main/dashboard/widgets/hdfs_links.hbs | 2 +-
.../main/dashboard/widgets/yarn_links.hbs | 2 +-
ambari-web/app/templates/main/host.hbs | 31 +-
.../templates/main/host/bulk_operation_menu.hbs | 220 +--
.../templates/main/host/combo_search_box.hbs | 13 +-
.../app/templates/main/host/host_alerts.hbs | 3 +-
ambari-web/app/templates/main/host/logs.hbs | 3 +
.../app/templates/main/host/stack_versions.hbs | 3 +
ambari-web/app/templates/main/service/item.hbs | 2 +-
.../templates/main/service/services/hive.hbs | 8 +
ambari-web/app/templates/wizard/step3.hbs | 16 +-
ambari-web/app/templates/wizard/step4.hbs | 19 +-
ambari-web/app/templates/wizard/step6.hbs | 2 +-
ambari-web/app/templates/wizard/step9.hbs | 4 +-
ambari-web/app/views/common/filter_view.js | 2 +-
.../app/views/common/log_search_ui_link_view.js | 4 +-
.../dependent_configs_list_popup.js | 2 +-
.../app/views/common/quick_view_link_view.js | 2 +-
.../main/admin/stack_upgrade/versions_view.js | 3 +-
.../app/views/main/alert_definitions_view.js | 27 +-
.../alerts/alert_definitions_actions_view.js | 2 +
.../views/main/host/hosts_table_menu_view.js | 2 +
.../app/views/main/service/services/hive.js | 25 +-
.../apache/oozie/ambari/view/HDFSFileUtils.java | 87 +
.../org/apache/oozie/ambari/view/JobType.java | 22 +
.../ambari/view/OozieProxyImpersonator.java | 1042 ++++++------
.../apache/oozie/ambari/view/OozieUtils.java | 71 +
.../org/apache/oozie/ambari/view/Utils.java | 154 ++
.../wfmanager/src/main/resources/ui/.jshintrc | 38 +
.../main/resources/ui/app/components/.gitkeep | 0
.../ui/app/components/archive-config.js | 3 +-
.../ui/app/components/bundle-config.js | 262 +++
.../ui/app/components/bundle-coord-config.js | 108 ++
.../ui/app/components/conditional-data-input.js | 78 +
.../ui/app/components/confirmation-dialog.js | 25 +
.../resources/ui/app/components/coord-config.js | 521 ++++++
.../ui/app/components/credentials-config.js | 175 +-
.../app/components/data-input-output-config.js | 97 ++
.../resources/ui/app/components/data-input.js | 41 +
.../ui/app/components/dataset-config.js | 103 ++
.../ui/app/components/date-with-expr.js | 78 +
.../ui/app/components/decision-add-branch.js | 78 +-
.../ui/app/components/decision-config.js | 43 +-
.../ui/app/components/designer-workspace.js | 158 ++
.../ui/app/components/distcp-action-info.js | 26 +
.../ui/app/components/distcp-action.js | 6 +-
.../ui/app/components/email-action-info.js | 26 +
.../resources/ui/app/components/email-action.js | 33 +-
.../resources/ui/app/components/file-config.js | 3 +-
.../ui/app/components/flow-designer.js | 728 +++++----
.../ui/app/components/fs-action-info.js | 26 +
.../resources/ui/app/components/fs-action.js | 64 +-
.../ui/app/components/fsaction-info.js | 21 +
.../resources/ui/app/components/hdfs-browser.js | 5 +-
.../ui/app/components/hive-action-info.js | 26 +
.../resources/ui/app/components/hive-action.js | 38 +-
.../ui/app/components/hive2-action-info.js | 25 +
.../resources/ui/app/components/hive2-action.js | 44 +-
.../resources/ui/app/components/info-header.js | 26 +
.../ui/app/components/instance-list-config.js | 54 +
.../ui/app/components/java-action-info.js | 25 +
.../resources/ui/app/components/java-action.js | 25 +-
.../resources/ui/app/components/job-config.js | 303 ++++
.../resources/ui/app/components/job-details.js | 391 ++++-
.../ui/app/components/killnode-config.js | 29 +
.../ui/app/components/killnode-manager.js | 62 +
.../ui/app/components/map-red-action.js | 6 +-
.../ui/app/components/map-reduce-action-info.js | 25 +
.../ui/app/components/name-value-config.js | 7 +-
.../ui/app/components/name-value-info.js | 21 +
.../ui/app/components/named-properties.js | 25 +-
.../ui/app/components/pig-action-info.js | 25 +
.../resources/ui/app/components/pig-action.js | 16 +-
.../ui/app/components/prepare-config-fs.js | 7 +-
.../ui/app/components/prepare-config-info.js | 21 +
.../ui/app/components/prepare-config.js | 3 +-
.../ui/app/components/preview-dialog.js | 20 +
.../ui/app/components/property-value-config.js | 21 +
.../main/resources/ui/app/components/save-wf.js | 170 ++
.../ui/app/components/shell-action-info.js | 25 +
.../resources/ui/app/components/shell-action.js | 20 +-
.../resources/ui/app/components/sla-info.js | 148 +-
.../ui/app/components/spark-action-info.js | 25 +
.../resources/ui/app/components/spark-action.js | 59 +-
.../ui/app/components/sqoop-action-info.js | 25 +
.../resources/ui/app/components/sqoop-action.js | 5 +-
.../ui/app/components/ssh-action-info.js | 25 +
.../resources/ui/app/components/ssh-action.js | 24 +-
.../app/components/sub-workflow-action-info.js | 25 +
.../resources/ui/app/components/sub-workflow.js | 17 +-
.../ui/app/components/transition-config.js | 44 +-
.../ui/app/components/workflow-action-editor.js | 58 +-
.../ui/app/components/workflow-actions.js | 7 +
.../ui/app/components/workflow-credentials.js | 65 +-
.../app/components/workflow-job-action-info.js | 22 +
.../ui/app/components/workflow-node.js | 9 +
.../ui/app/components/workflow-parameters.js | 64 +-
.../resources/ui/app/components/workflow-sla.js | 15 +-
.../main/resources/ui/app/controllers/.gitkeep | 0
.../main/resources/ui/app/controllers/design.js | 5 -
.../ui/app/domain/action-type-resolver.js | 62 +
.../ui/app/domain/actionjob_hanlder.js | 1 +
.../app/domain/bundle/bundle-xml-generator.js | 55 +
.../ui/app/domain/bundle/bundle-xml-importer.js | 87 +
.../resources/ui/app/domain/bundle/bundle.js | 22 +
.../coordinator/coordinator-xml-generator.js | 204 +++
.../coordinator/coordinator-xml-importer.js | 272 ++++
.../ui/app/domain/coordinator/coordinator.js | 22 +
.../ui/app/domain/cytoscape-flow-renderer.js | 348 ++++
.../resources/ui/app/domain/cytoscape-style.js | 123 ++
.../ui/app/domain/default-layout-manager.js | 10 +-
.../resources/ui/app/domain/findnode-mixin.js | 113 +-
.../src/main/resources/ui/app/domain/id-gen.js | 4 +
.../ui/app/domain/jsplumb-flow-renderer.js | 194 +++
.../resources/ui/app/domain/mapping-utils.js | 31 +-
.../resources/ui/app/domain/node-factory.js | 10 +-
.../resources/ui/app/domain/node-handler.js | 49 +-
.../src/main/resources/ui/app/domain/node.js | 3 +-
.../main/resources/ui/app/domain/sla-info.js | 38 +-
.../main/resources/ui/app/domain/transition.js | 5 +-
.../ui/app/domain/workflow-importer.js | 8 +-
.../ui/app/domain/workflow-json-importer.js | 92 ++
.../ui/app/domain/workflow-path-util.js | 73 +
.../ui/app/domain/workflow-xml-generator.js | 1 -
.../main/resources/ui/app/domain/workflow.js | 114 +-
.../ui/app/domain/workflow_xml_mapper.js | 5 +-
.../src/main/resources/ui/app/helpers/.gitkeep | 0
.../src/main/resources/ui/app/index.html | 9 +
.../src/main/resources/ui/app/routes/.gitkeep | 0
.../main/resources/ui/app/routes/dashboard.js | 10 +-
.../src/main/resources/ui/app/routes/design.js | 38 +-
.../ui/app/services/workflow-clipboard.js | 34 +
.../ui/app/services/workspace-manager.js | 62 +
.../src/main/resources/ui/app/styles/app.less | 1497 ++++++++++++++++++
.../ui/app/templates/components/.gitkeep | 0
.../app/templates/components/bundle-config.hbs | 129 ++
.../components/bundle-coord-config.hbs | 58 +
.../templates/components/bundle-job-details.hbs | 17 +-
.../components/conditional-data-input.hbs | 64 +
.../components/confirmation-dialog.hbs | 34 +
.../app/templates/components/coord-config.hbs | 352 ++++
.../templates/components/coord-job-details.hbs | 17 +-
.../templates/components/credentials-config.hbs | 33 +-
.../components/data-input-output-config.hbs | 68 +
.../ui/app/templates/components/data-input.hbs | 40 +
.../app/templates/components/dataset-config.hbs | 70 +
.../app/templates/components/date-with-expr.hbs | 41 +
.../components/decision-add-branch.hbs | 4 +-
.../templates/components/decision-config.hbs | 2 +-
.../templates/components/designer-workspace.hbs | 106 ++
.../templates/components/distcp-action-info.hbs | 35 +
.../templates/components/email-action-info.hbs | 28 +
.../app/templates/components/email-action.hbs | 10 +-
.../ui/app/templates/components/field-error.hbs | 3 +
.../app/templates/components/flow-designer.hbs | 300 ++--
.../app/templates/components/fs-action-info.hbs | 33 +
.../ui/app/templates/components/fs-action.hbs | 3 +-
.../app/templates/components/fsaction-info.hbs | 39 +
.../app/templates/components/hdfs-browser.hbs | 2 +-
.../templates/components/hive-action-info.hbs | 47 +
.../ui/app/templates/components/hive-action.hbs | 6 +-
.../templates/components/hive2-action-info.hbs | 49 +
.../app/templates/components/hive2-action.hbs | 6 +-
.../ui/app/templates/components/info-header.hbs | 18 +
.../components/instance-list-config.hbs | 35 +
.../templates/components/java-action-info.hbs | 52 +
.../ui/app/templates/components/java-action.hbs | 4 +-
.../ui/app/templates/components/job-config.hbs | 126 ++
.../ui/app/templates/components/job-details.hbs | 2 +-
.../templates/components/killnode-config.hbs | 67 +
.../templates/components/killnode-manager.hbs | 69 +
.../components/map-reduce-action-info.hbs | 41 +
.../templates/components/name-value-info.hbs | 22 +
.../templates/components/named-properties.hbs | 2 +-
.../templates/components/pig-action-info.hbs | 47 +
.../ui/app/templates/components/pig-action.hbs | 2 +-
.../templates/components/prepare-config-fs.hbs | 46 +-
.../components/prepare-config-info.hbs | 22 +
.../app/templates/components/preview-dialog.hbs | 33 +
.../components/property-value-config.hbs | 22 +
.../ui/app/templates/components/save-wf.hbs | 79 +
.../templates/components/shell-action-info.hbs | 48 +
.../app/templates/components/shell-action.hbs | 4 +-
.../ui/app/templates/components/sla-info.hbs | 17 +-
.../templates/components/spark-action-info.hbs | 46 +
.../app/templates/components/spark-action.hbs | 6 +-
.../templates/components/sqoop-action-info.hbs | 41 +
.../templates/components/ssh-action-info.hbs | 32 +
.../ui/app/templates/components/ssh-action.hbs | 4 +-
.../components/sub-workflow-action-info.hbs | 29 +
.../app/templates/components/sub-workflow.hbs | 2 +-
.../templates/components/transition-config.hbs | 23 +-
.../templates/components/version-settings.hbs | 2 +-
.../templates/components/workflow-actions.hbs | 5 +
.../templates/components/workflow-config.hbs | 2 +-
.../components/workflow-credentials.hbs | 34 +-
.../components/workflow-job-action-info.hbs | 80 +
.../components/workflow-job-details.hbs | 158 +-
.../app/templates/components/workflow-node.hbs | 3 +-
.../components/workflow-parameters.hbs | 23 +-
.../resources/ui/app/templates/dashboard.hbs | 2 +-
.../main/resources/ui/app/templates/design.hbs | 2 +-
.../main/resources/ui/app/utils/constants.js | 43 +-
.../app/validators/decission-node-validator.js | 58 +
.../app/validators/duplicate-data-node-name.js | 60 +
.../validators/duplicate-flattened-node-name.js | 66 +
.../app/validators/duplicate-kill-node-name.js | 58 +
.../ui/app/validators/fs-action-validator.js | 76 +
.../ui/app/validators/job-params-validator.js | 54 +
.../ui/app/validators/operand-length.js | 46 +
.../resources/ui/app/validators/unique-name.js | 59 +
.../wfmanager/src/main/resources/ui/bower.json | 5 +-
.../src/main/resources/ui/ember-cli-build.js | 10 +
.../hdfs-directory-viewer/addon/.gitkeep | 0
.../hdfs-directory-viewer/app/.gitkeep | 0
.../tests/dummy/app/components/.gitkeep | 0
.../tests/dummy/app/controllers/.gitkeep | 0
.../tests/dummy/app/helpers/.gitkeep | 0
.../tests/dummy/app/models/.gitkeep | 0
.../tests/dummy/app/routes/.gitkeep | 0
.../dummy/app/templates/components/.gitkeep | 0
.../tests/integration/.gitkeep | 0
.../hdfs-directory-viewer/tests/unit/.gitkeep | 0
.../hdfs-directory-viewer/vendor/.gitkeep | 0
.../resources/ui/mock-service/mock-server.js | 52 +
.../main/resources/ui/mock-service/mockData.js | 316 ++++
.../src/main/resources/ui/package.json | 18 +-
.../main/resources/ui/public/assets/favicon.ico | Bin 0 -> 1150 bytes
.../main/resources/ui/public/assets/join.png | Bin 0 -> 331 bytes
.../main/resources/ui/public/assets/logo.png | Bin 0 -> 4568 bytes
.../main/resources/ui/public/assets/play.png | Bin 0 -> 1164 bytes
.../main/resources/ui/public/assets/sitemap.png | Bin 0 -> 317 bytes
.../main/resources/ui/public/assets/stop.png | Bin 0 -> 1164 bytes
.../src/main/resources/ui/public/loader.gif | Bin 0 -> 42435 bytes
.../resources/ui/public/sampledata/bundle.xml | 32 +
.../ui/public/sampledata/coordinator.xml | 113 ++
.../resources/ui/tests/integration/.gitkeep | 0
.../components/bundle-config-test.js | 40 +
.../components/bundle-coord-config-test.js | 40 +
.../components/conditional-data-input-test.js | 40 +
.../components/confirmation-dialog-test.js | 40 +
.../integration/components/coord-config-test.js | 40 +
.../components/data-input-output-config-test.js | 40 +
.../integration/components/data-input-test.js | 40 +
.../components/dataset-config-test.js | 40 +
.../components/date-with-expr-test.js | 40 +
.../components/designer-workspace-test.js | 40 +
.../components/distcp-action-info-test.js | 41 +
.../components/email-action-info-test.js | 41 +
.../components/fs-action-info-test.js | 41 +
.../components/fsaction-info-test.js | 41 +
.../components/hive-action-info-test.js | 41 +
.../components/hive2-action-info-test.js | 41 +
.../integration/components/info-header-test.js | 41 +
.../components/instance-list-config-test.js | 41 +
.../components/java-action-info-test.js | 41 +
.../integration/components/job-config-test.js | 41 +
.../components/killnode-config-test.js | 41 +
.../components/killnode-manager-test.js | 41 +
.../components/map-reduce-action-info-test.js | 41 +
.../components/name-value-info-test.js | 41 +
.../components/pig-action-info-test.js | 41 +
.../components/prepare-config-info-test.js | 41 +
.../components/preview-dialog-test.js | 40 +
.../components/property-value-config-test.js | 41 +
.../integration/components/save-wf-test.js | 40 +
.../components/shell-action-info-test.js | 41 +
.../components/spark-action-info-test.js | 41 +
.../components/sqoop-action-info-test.js | 41 +
.../components/ssh-action-info-test.js | 41 +
.../components/sub-workflow-action-info-test.js | 41 +
.../src/main/resources/ui/tests/unit/.gitkeep | 0
.../unit/services/workflow-clipboard-test.js | 29 +
.../unit/services/workspace-manager-test.js | 29 +
.../validators/decission-node-validator-test.js | 26 +
.../validators/duplicate-data-node-name-test.js | 27 +
.../duplicate-flattened-node-name-test.js | 27 +
.../validators/duplicate-kill-node-name-test.js | 27 +
.../unit/validators/fs-action-validator-test.js | 26 +
.../validators/job-params-validator-test.js | 26 +
.../unit/validators/operand-length-test.js | 27 +
.../tests/unit/validators/unique-name-test.js | 27 +
.../views/wfmanager/src/main/resources/view.xml | 2 +-
334 files changed, 23251 insertions(+), 2549 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/99c82166/ambari-server/src/main/resources/upgrade-pack.xsd
----------------------------------------------------------------------