ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Mon, 04 Jan 2016 21:38:43 GMT
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/5310b95e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5310b95e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5310b95e

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 5310b95e63b955c697f33413b3af0bce8068f9fc
Parents: 99ce307 7a9e624
Author: Nate Cole <ncole@hortonworks.com>
Authored: Mon Jan 4 16:37:36 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Mon Jan 4 16:37:36 2016 -0500

----------------------------------------------------------------------
 .../main/resources/ui/admin-web/app/index.html  |   12 +-
 .../app/scripts/controllers/NavbarCtrl.js       |   16 +-
 .../ambariViews/CreateViewInstanceCtrl.js       |   18 +-
 .../controllers/ambariViews/ViewsEditCtrl.js    |   40 +-
 .../controllers/ambariViews/ViewsListCtrl.js    |   11 +-
 .../clusters/ClustersManageAccessCtrl.js        |   10 +-
 .../controllers/clusters/UserAccessListCtrl.js  |   52 +-
 .../controllers/groups/GroupsCreateCtrl.js      |    7 +-
 .../controllers/groups/GroupsEditCtrl.js        |   24 +-
 .../controllers/groups/GroupsListCtrl.js        |   36 +-
 .../app/scripts/controllers/mainCtrl.js         |   11 +-
 .../stackVersions/StackVersionsCreateCtrl.js    |   14 +-
 .../stackVersions/StackVersionsEditCtrl.js      |   30 +-
 .../stackVersions/StackVersionsListCtrl.js      |   13 +-
 .../controllers/users/UsersCreateCtrl.js        |   10 +-
 .../scripts/controllers/users/UsersListCtrl.js  |   45 +-
 .../scripts/controllers/users/UsersShowCtrl.js  |   64 +-
 .../app/scripts/directives/editableList.js      |    8 +-
 .../ui/admin-web/app/scripts/i18n.config.js     |  284 +-
 .../ui/admin-web/app/scripts/services/Alert.js  |    2 +-
 .../app/scripts/services/ConfirmationModal.js   |    8 +-
 .../ui/admin-web/app/scripts/services/Stack.js  |   31 +-
 .../app/scripts/services/UnsavedDialog.js       |    2 +-
 .../app/scripts/services/UserConstants.js       |    6 +-
 .../resources/ui/admin-web/app/styles/main.css  |    9 +-
 .../admin-web/app/views/ambariViews/create.html |   56 +-
 .../admin-web/app/views/ambariViews/edit.html   |   86 +-
 .../app/views/ambariViews/listTable.html        |   24 +-
 .../app/views/ambariViews/modals/create.html    |   34 +-
 .../app/views/ambariViews/modals/edit.html      |   44 +-
 .../app/views/clusters/manageAccess.html        |   10 +-
 .../app/views/clusters/userAccessList.html      |   22 +-
 .../app/views/directives/editableList.html      |    4 +-
 .../ui/admin-web/app/views/groups/create.html   |   16 +-
 .../ui/admin-web/app/views/groups/edit.html     |   28 +-
 .../ui/admin-web/app/views/groups/list.html     |   26 +-
 .../ui/admin-web/app/views/leftNavbar.html      |   26 +-
 .../resources/ui/admin-web/app/views/main.html  |   38 +-
 .../admin-web/app/views/modals/AboutModal.html  |   16 +-
 .../views/modals/BodyForDeregisterVersion.html  |    2 +-
 .../app/views/modals/TimeoutWarning.html        |    4 +-
 .../admin-web/app/views/stackVersions/list.html |   24 +-
 .../views/stackVersions/stackVersionPage.html   |   41 +-
 .../ui/admin-web/app/views/users/create.html    |   42 +-
 .../ui/admin-web/app/views/users/list.html      |   30 +-
 .../app/views/users/modals/changePassword.html  |   28 +-
 .../ui/admin-web/app/views/users/show.html      |   42 +-
 .../clusters/UserAccessListCtrl_test.js         |  223 ++
 .../controllers/groups/GroupsListCtrl_test.js   |  129 +
 .../stackVersions/StackversionsListCtrl_test.js |  119 +-
 .../controllers/users/UsersListCtrl_test.js     |  383 ++
 ambari-server/pom.xml                           |   11 -
 .../AmbariManagementControllerImpl.java         |  134 +-
 .../ambari/server/controller/AmbariServer.java  |    8 +-
 .../server/controller/KerberosHelper.java       |    2 +-
 .../server/controller/KerberosHelperImpl.java   |   71 +-
 .../controller/ServiceComponentRequest.java     |    7 +-
 .../internal/ComponentResourceProvider.java     |  604 +--
 .../HostKerberosIdentityResourceProvider.java   |    9 +-
 .../controller/utilities/DatabaseChecker.java   |  136 +-
 .../server/metadata/RoleCommandOrder.java       |    3 +
 .../ambari/server/stack/StackDirectory.java     |    6 +-
 .../kerberos/KerberosPrincipalDescriptor.java   |   13 +-
 .../state/kerberos/KerberosPrincipalType.java   |   22 +-
 .../ambari/server/topology/AmbariContext.java   |    4 +
 .../topology/ClusterConfigurationRequest.java   |    2 +-
 .../ambari/server/topology/HostRequest.java     |    4 +
 .../ambari/server/topology/LogicalRequest.java  |   35 +-
 .../server/upgrade/UpgradeCatalog211.java       |  140 +-
 .../server/upgrade/UpgradeCatalog221.java       |   14 +-
 .../src/main/package/deb/control/preinst        |    2 +-
 .../src/main/package/rpm/preinstall.sh          |    2 +-
 ambari-server/src/main/python/ambari-server.py  |    4 +
 .../python/ambari_server/serverConfiguration.py |   14 +
 .../src/main/python/ambari_server/setupHttps.py |   22 +-
 .../src/main/python/ambari_server_main.py       |   13 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |    5 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    5 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |    5 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |    5 +
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |    5 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |    5 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |    5 +
 .../0.1.0/configuration/ams-hbase-site.xml      |   16 +
 .../HAWQ/2.0.0/package/scripts/common.py        |   17 +-
 .../HAWQ/2.0.0/package/scripts/master_helper.py |   13 +-
 .../HAWQ/2.0.0/package/scripts/params.py        |   21 +
 .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml  |    6 +
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |   49 +-
 .../package/scripts/hdfs_nfsgateway.py          |    5 +-
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |   36 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |    1 +
 .../MAHOUT/1.0.0.2.3/package/scripts/params.py  |    2 +
 .../0.4.0/package/scripts/ranger_service.py     |    2 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   14 +-
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |    2 +-
 .../0.9.1.2.1/configuration/storm-site.xml      |    3 +-
 .../custom_actions/scripts/install_packages.py  |    8 +-
 .../src/main/resources/role_command_order.json  |  104 -
 .../before-START/files/fast-hdfs-resource.jar   |  Bin 19285353 -> 19285461 bytes
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   48 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |    5 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |   28 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |    1 -
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |  960 +++++
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     |    6 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     |  847 +++++
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |   92 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 1001 +++++
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml     |  808 ++++
 .../server/controller/KerberosHelperTest.java   |   61 +-
 .../internal/ComponentResourceProviderTest.java |  213 +-
 .../utilities/DatabaseCheckerTest.java          |   28 +-
 .../KerberosPrincipalDescriptorTest.java        |   73 +
 .../ClusterConfigurationRequestTest.java        |   43 +-
 .../server/upgrade/UpgradeCatalog221Test.java   |   31 +
 .../src/test/python/TestAmbariServer.py         |  103 +-
 .../custom_actions/TestInstallPackages.py       |   56 +-
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |   18 +-
 .../python/stacks/2.0.6/HDFS/test_nfsgateway.py |    8 +
 .../stacks/2.0.6/common/test_stack_advisor.py   |   47 +-
 .../python/stacks/2.0.6/configs/default.json    |    1 +
 .../python/stacks/2.0.6/configs/secured.json    |    1 +
 .../stacks/2.1/common/test_stack_advisor.py     |   15 +-
 .../stacks/2.2/common/test_stack_advisor.py     |   50 +-
 .../stacks/2.3/common/services-pxf-hdfs.json    | 3490 ++++++++++++++++++
 .../stacks/2.3/common/test_stack_advisor.py     |   57 +-
 .../stacks/HDP/0.1/role_command_order.json      |  104 +
 .../stacks/HDP/2.0.5/role_command_order.json    |  104 +
 ambari-web/app/assets/test/tests.js             |    3 +-
 .../resourceManager/step3_controller.js         |   12 +-
 .../resourceManager/step4_controller.js         |   40 +-
 .../main/admin/kerberos/step2_controller.js     |   12 +-
 .../main/admin/stack_and_upgrade_controller.js  |   14 +
 ambari-web/app/controllers/main/service.js      |   31 +-
 .../controllers/main/service/add_controller.js  |    5 +-
 .../controllers/main/service/info/configs.js    |   22 +-
 .../service/manage_config_groups_controller.js  |   20 +-
 .../app/controllers/wizard/step6_controller.js  |  120 +-
 .../app/controllers/wizard/step7_controller.js  |  144 +-
 ambari-web/app/data/HDP2/rm_ha_properties.js    |   20 +-
 ambari-web/app/messages.js                      |    6 +-
 ambari-web/app/mixins.js                        |    3 +
 .../configs/config_recommendation_parser.js     |  248 ++
 .../common/configs/config_recommendations.js    |  201 +
 ...onfig_with_override_recommendation_parser.js |  112 +
 .../app/mixins/common/configs/configs_saver.js  |    2 +-
 .../mixins/common/configs/enhanced_configs.js   |  625 +---
 ambari-web/app/mixins/common/serverValidator.js |    6 +-
 .../main/service/configs/config_overridable.js  |   12 +-
 .../models/configs/objects/service_config.js    |    4 +
 .../configs/objects/service_config_property.js  |   14 +
 ambari-web/app/models/host_component.js         |    8 +-
 ambari-web/app/models/upgrade_entity.js         |    2 +
 ambari-web/app/routes/add_service_routes.js     |    2 +-
 ambari-web/app/styles/application.less          |   25 +-
 .../modal_popups/dependent_configs_list.hbs     |    4 +-
 .../main/admin/stack_upgrade/upgrade_group.hbs  |    4 +-
 .../admin/stack_upgrade/upgrade_version_box.hbs |    3 +
 .../templates/main/dashboard/config_history.hbs |    8 +-
 .../app/templates/main/service/menu_item.hbs    |   22 +-
 ambari-web/app/utils/ajax/ajax.js               |   22 +
 ambari-web/app/utils/config.js                  |   42 +-
 .../utils/configs/rm_ha_config_initializer.js   |   20 +-
 ambari-web/app/views/common/controls_view.js    |    9 +-
 .../dependent_configs_list_popup.js             |    7 +-
 .../common/modal_popups/select_groups_popup.js  |    2 +-
 .../stack_upgrade/upgrade_version_box_view.js   |    8 +-
 .../views/main/dashboard/config_history_view.js |    9 +-
 .../main/host/details/host_component_view.js    |   14 +-
 ambari-web/app/views/main/service/item.js       |    3 +-
 ambari-web/app/views/main/service/menu.js       |    4 +-
 ambari-web/test/app_test.js                     |   47 +-
 .../global/cluster_controller_test.js           |  160 +-
 .../global/update_controller_test.js            |   41 +-
 ambari-web/test/controllers/installer_test.js   |  456 ++-
 .../nameNode/step3_controller_test.js           |   28 +-
 .../nameNode/step4_controller_test.js           |   23 +-
 .../progress_popup_controller_test.js           |  111 +-
 .../resourceManager/step3_controller_test.js    |   60 +-
 .../admin/highAvailability_controller_test.js   |  166 +-
 .../admin/kerberos/step2_controller_test.js     |   30 +-
 .../admin/kerberos/step4_controller_test.js     |   23 +-
 .../admin/kerberos/step6_controller_test.js     |   22 +-
 .../controllers/main/admin/kerberos_test.js     |  102 +-
 .../admin/stack_and_upgrade_controller_test.js  |  454 ++-
 .../definitions_configs_controller_test.js      |  149 +-
 ...anage_alert_notifications_controller_test.js |   31 +-
 .../heatmap_metrics/heatmap_metric_test.js      |  165 +-
 .../controllers/main/charts/heatmap_test.js     |   62 +-
 .../dashboard/config_history_controller_test.js |   20 +-
 .../main/host/add_controller_test.js            |  246 +-
 .../main/host/configs_service_test.js           |   16 +-
 .../test/controllers/main/host/details_test.js  |  811 ++--
 .../main/service/add_controller_test.js         |  131 +-
 .../main/service/info/config_test.js            |   98 +-
 .../main/service/info/summary_test.js           |   35 +-
 .../test/controllers/main/service/item_test.js  |  252 +-
 .../manage_config_groups_controller_test.js     |  247 +-
 .../service/reassign/step1_controller_test.js   |   28 +-
 .../service/reassign/step4_controller_test.js   |   50 +-
 .../main/service/reassign_controller_test.js    |   16 +-
 .../widgets/create/step2_controller_test.js     |  302 +-
 .../test/controllers/main/service_test.js       |  118 +-
 .../controllers/main/views_controller_test.js   |    5 +-
 ambari-web/test/controllers/main_test.js        |   18 +-
 .../test/controllers/wizard/step10_test.js      |   85 +-
 .../test/controllers/wizard/step2_test.js       |   30 +-
 .../test/controllers/wizard/step3_test.js       |  371 +-
 .../test/controllers/wizard/step4_test.js       |  163 +-
 .../test/controllers/wizard/step5_test.js       |  246 +-
 .../test/controllers/wizard/step6_test.js       |  495 ++-
 .../test/controllers/wizard/step7_test.js       |  569 ++-
 .../test/controllers/wizard/step8_test.js       |  837 +++--
 .../test/controllers/wizard/step9_test.js       |  234 +-
 ambari-web/test/controllers/wizard_test.js      |  138 +-
 .../test/data/HDP2.2/site_properties_test.js    |   26 +-
 .../test/data/HDP2.3/site_properties_test.js    |   26 +-
 .../test/data/HDP2/site_properties_test.js      |   26 +-
 ambari-web/test/helpers.js                      |    2 +
 .../alert_definition_summary_mapper_test.js     |  165 +-
 .../service_config_version_mapper_test.js       |   83 +-
 .../stack_config_properties_mapper_test.js      |  382 +-
 .../test/mappers/configs/themes_mapper_test.js  |  180 +-
 ambari-web/test/mappers/service_mapper_test.js  |   15 +-
 ambari-web/test/mappers/stack_mapper_test.js    |   24 +-
 .../test/mappers/stack_service_mapper_test.js   |    2 +
 .../common/configs/enhanced_configs_test.js     |   10 +-
 .../kdc_credentials_controller_mixin_test.js    |   64 +-
 .../test/mixins/common/reload_popup_test.js     |   39 +-
 .../test/mixins/common/serverValidator_test.js  |   29 +-
 .../common/table_server_view_mixin_test.js      |  124 +-
 .../test/mixins/common/widget_mixin_test.js     |    2 +-
 .../common/widgets/export_metrics_mixin_test.js |   57 +-
 .../common/widgets/widget_section_test.js       |    6 +-
 .../wizard/wizardProgressPageController_test.js |   69 +-
 ambari-web/test/models/cluster_states_test.js   |   13 +-
 .../test/models/configs/config_group_test.js    |   28 +-
 .../configs/service_config_version_test.js      |    2 +-
 ambari-web/test/models/form_test.js             |    3 +-
 ambari-web/test/router_test.js                  |   63 +-
 ambari-web/test/utils/ajax/ajax_test.js         |   20 +-
 ambari-web/test/utils/blueprint_test.js         |   32 +-
 ambari-web/test/utils/config_test.js            |  350 +-
 .../utils/configs/config_initializer_test.js    |   80 +-
 ambari-web/test/utils/helper_test.js            |    5 +-
 .../test/utils/host_progress_popup_test.js      |    5 +-
 ambari-web/test/utils/ui_effects_test.js        |   11 +-
 .../test/views/common/chart/linear_time_test.js |    2 +-
 .../common/configs/config_history_flow_test.js  |  147 +-
 .../notification_configs_view_test.js           |   64 +-
 .../service_configs_by_category_view_test.js    |   21 +-
 .../configs/widgets/config_widget_view_test.js  |   87 +-
 .../widgets/list_config_widget_view_test.js     |   43 +-
 .../widgets/slider_config_widget_view_test.js   |  269 +-
 .../widgets/toggle_config_widget_view_test.js   |   43 +-
 .../test/views/common/controls_view_test.js     |  197 +-
 .../test/views/common/custom_date_popup_test.js |   69 +-
 .../views/common/filter_combo_cleanable_test.js |   10 +-
 .../form/manage_kdc_credentials_form_test.js    |   87 +-
 .../test/views/common/modal_popup_test.js       |   11 +-
 .../modal_popups/cluster_check_popup_test.js    |   53 +-
 .../modal_popups/hosts_table_list_popup_test.js |   30 +-
 .../views/common/rolling_restart_view_test.js   |   27 +-
 .../common/widget/graph_widget_view_test.js     |   59 +-
 .../main/admin/stack_upgrade/menu_view_test.js  |    7 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   |   28 +-
 .../admin/stack_upgrade/version_view_test.js    |   14 +-
 ambari-web/test/views/main/admin_test.js        |    6 +-
 .../select_definitions_popup_body_view_test.js  |   26 +-
 .../alerts/manage_alert_groups_view_test.js     |   59 -
 .../main/charts/heatmap/heatmap_host_test.js    |  211 +-
 .../main/dashboard/config_history_view_test.js  |    4 +-
 .../test/views/main/dashboard/widget_test.js    |   80 +-
 .../dashboard/widgets/datanode_live_test.js     |   10 +-
 .../test/views/main/dashboard/widgets_test.js   |   26 +-
 .../host/details/host_component_view_test.js    |   38 +-
 .../host_component_views/datanode_view_test.js  |    6 +
 ambari-web/test/views/main/host/details_test.js |    8 +-
 ambari-web/test/views/main/host/menu_test.js    |    9 +-
 ambari-web/test/views/main/menu_test.js         |    8 +-
 .../ambari_metrics/regionserver_base_test.js    |   63 +-
 .../views/main/service/info/summary_test.js     |  293 +-
 ambari-web/test/views/main/service/menu_test.js |   67 +
 ambari-web/test/views/wizard/step0_view_test.js |   12 +-
 .../test/views/wizard/step10_view_test.js       |   11 +-
 ambari-web/test/views/wizard/step1_view_test.js |   73 +-
 .../step3/hostWarningPopupBody_view_test.js     |  131 +-
 ambari-web/test/views/wizard/step3_view_test.js |   23 +-
 ambari-web/test/views/wizard/step5_view_test.js |   40 +-
 ambari-web/test/views/wizard/step6_view_test.js |   14 +-
 ambari-web/test/views/wizard/step8_view_test.js |   22 +-
 .../wizard/step9/hostLogPopupBody_view_test.js  |  210 +-
 ambari-web/test/views/wizard/step9_view_test.js |   48 +-
 .../ambari/fast_hdfs_resource/Resource.java     |    2 +-
 295 files changed, 19857 insertions(+), 6614 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5310b95e/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/5310b95e/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/5310b95e/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/5310b95e/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/5310b95e/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/5310b95e/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------


Mime
View raw message