You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2016/10/14 21:04:42 UTC

[23/23] ambari git commit: AMBARI-18573. Migration to Bootstrap3 framework (akovalenko)

AMBARI-18573. Migration to Bootstrap3 framework (akovalenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a77e39c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a77e39c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a77e39c

Branch: refs/heads/trunk
Commit: 2a77e39ca78d157c3286a317325ac6cba03670cb
Parents: 6951da4
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Fri Oct 14 22:22:17 2016 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Sat Oct 15 00:03:35 2016 +0300

----------------------------------------------------------------------
 LICENSE.txt                                     |     4 +-
 ambari-web/app/app.js                           |     5 +
 .../fonts/glyphicons-halflings-regular.eot      |   Bin 0 -> 20127 bytes
 .../fonts/glyphicons-halflings-regular.svg      |   288 +
 .../fonts/glyphicons-halflings-regular.ttf      |   Bin 0 -> 45404 bytes
 .../fonts/glyphicons-halflings-regular.woff     |   Bin 0 -> 23424 bytes
 .../fonts/glyphicons-halflings-regular.woff2    |   Bin 0 -> 18028 bytes
 ambari-web/app/config.js                        |     8 +-
 ambari-web/app/controllers/application.js       |    63 +-
 .../main/admin/service_auto_start.js            |     6 +-
 .../main/admin/stack_and_upgrade_controller.js  |    24 +-
 .../admin/stack_upgrade_history_controller.js   |     2 +-
 .../add_alert_definition/step1_controller.js    |    14 +-
 .../alert_definitions_actions_controller.js     |    14 +-
 .../main/alerts/alert_instances_controller.js   |     3 +-
 .../alerts/manage_alert_groups_controller.js    |     4 +-
 .../app/controllers/main/charts/heatmap.js      |     6 +-
 .../controllers/main/service/info/summary.js    |     3 +-
 .../service/manage_config_groups_controller.js  |     3 +-
 .../app/controllers/wizard/step10_controller.js |     4 +-
 .../app/controllers/wizard/step1_controller.js  |     2 +-
 .../wizard/step7/assign_master_controller.js    |     3 +-
 ambari-web/app/data/host/categories.js          |     4 +-
 ambari-web/app/messages.js                      |    26 +-
 .../app/mixins/common/configs/configs_saver.js  |     1 +
 .../app/mixins/common/widgets/widget_mixin.js   |    12 +-
 .../mixins/main/dashboard/widgets/editable.js   |     3 +-
 .../dashboard/widgets/editable_with_limit.js    |     3 +-
 .../widgets/single_numeric_threshold.js         |     3 +-
 .../details/host_components/decommissionable.js |     7 +-
 .../main/service/configs/config_overridable.js  |     3 +-
 .../service/configs/widget_popover_support.js   |     5 +-
 .../app/mixins/wizard/wizardProgressPageView.js |    12 +-
 ambari-web/app/models/alerts/alert_config.js    |    14 +-
 .../app/models/alerts/alert_definition.js       |    16 +-
 ambari-web/app/models/alerts/alert_instance.js  |     2 +-
 ambari-web/app/models/authentication.js         |     2 +-
 ambari-web/app/models/host_component.js         |    48 +-
 ambari-web/app/models/hosts.js                  |    18 +-
 ambari-web/app/models/repository.js             |     6 +-
 ambari-web/app/router.js                        |     5 +-
 .../app/routes/activate_hawq_standby_routes.js  |     3 +-
 .../app/routes/add_alert_definition_routes.js   |     3 +-
 .../app/routes/add_hawq_standby_routes.js       |     3 +-
 ambari-web/app/routes/add_host_routes.js        |     3 +-
 ambari-web/app/routes/add_kerberos_routes.js    |     3 +-
 ambari-web/app/routes/add_service_routes.js     |     3 +-
 ambari-web/app/routes/create_widget.js          |     3 +-
 ambari-web/app/routes/edit_widget.js            |     3 +-
 .../app/routes/high_availability_routes.js      |     3 +-
 ambari-web/app/routes/main.js                   |     3 +-
 .../app/routes/ra_high_availability_routes.js   |     3 +-
 ambari-web/app/routes/reassign_master_routes.js |     3 +-
 .../app/routes/remove_hawq_standby_routes.js    |     3 +-
 .../app/routes/rm_high_availability_routes.js   |     3 +-
 ambari-web/app/routes/rollbackHA_routes.js      |     3 +-
 ambari-web/app/routes/stack_upgrade_routes.js   |     3 +-
 ambari-web/app/styles/alerts.less               |   142 +-
 ambari-web/app/styles/application.less          |  1673 ++-
 ambari-web/app/styles/bootstrap_overrides.less  |    72 +
 ambari-web/app/styles/common.less               |   106 +-
 ambari-web/app/styles/config_history_flow.less  |    71 +-
 .../app/styles/enhanced_service_dashboard.less  |    75 +-
 ambari-web/app/styles/log_file_search.less      |     4 +-
 ambari-web/app/styles/modal_popups.less         |   352 +-
 ambari-web/app/styles/stack_versions.less       |   160 +-
 .../app/styles/theme/bootstrap-ambari.css       |   541 +
 ambari-web/app/styles/widgets.less              |    28 +-
 ambari-web/app/templates/application.hbs        |   205 +-
 .../common/assign_master_components.hbs         |    46 +-
 .../app/templates/common/chart/linear_time.hbs  |     4 +-
 .../common/configs/addPropertyWindow.hbs        |    64 +-
 .../common/configs/compare_property.hbs         |    28 +-
 .../configs/config_history_dropdown_row.hbs     |    10 +-
 .../common/configs/config_history_flow.hbs      |    46 +-
 .../app/templates/common/configs/controls.hbs   |    18 +-
 .../common/configs/notifications_configs.hbs    |   144 +-
 .../common/configs/overriddenProperty.hbs       |    74 +-
 .../templates/common/configs/overrideWindow.hbs |    35 +-
 .../configs/propertyDependence_footer.hbs       |     2 +-
 .../common/configs/queuePopup_body.hbs          |     8 +-
 .../common/configs/queuePopup_footer.hbs        |     2 +-
 .../common/configs/save_configuration.hbs       |    10 +-
 .../common/configs/selectCreateConfigGroup.hbs  |    85 +-
 .../templates/common/configs/service_config.hbs |    34 +-
 .../common/configs/service_config_category.hbs  |    52 +-
 .../common/configs/service_config_wizard.hbs    |    20 +-
 .../common/configs/service_version_box.hbs      |    10 +-
 .../common/configs/services_config.hbs          |     6 +-
 .../configs/widgets/combo_config_widget.hbs     |     6 +-
 .../comparison/config_widget_comparison.hbs     |     4 +-
 .../common/configs/widgets/controls.hbs         |    20 +-
 .../configs/widgets/list_config_widget.hbs      |     2 +-
 .../overrides/config_widget_override.hbs        |     2 +-
 .../configs/widgets/plain_config_text_field.hbs |     6 +-
 .../configs/widgets/radio_button_config.hbs     |    10 +-
 .../widgets/service_config_password_field.hbs   |    26 +
 .../widgets/test_db_connection_widget.hbs       |    12 +-
 .../app/templates/common/custom_date_popup.hbs  |    34 +-
 .../app/templates/common/editable_list.hbs      |     6 +-
 .../templates/common/filter_combo_cleanable.hbs |    47 +-
 .../app/templates/common/filter_combobox.hbs    |    12 +-
 .../common/form/check_db_connection.hbs         |    24 +-
 .../app/templates/common/form/checkbox.hbs      |    12 +-
 ambari-web/app/templates/common/form/field.hbs  |     6 +-
 .../common/form/manage_credentilas_form.hbs     |     8 +-
 .../app/templates/common/form/spinner_input.hbs |    16 +-
 ambari-web/app/templates/common/grid/filter.hbs |    10 +-
 ambari-web/app/templates/common/grid/header.hbs |     2 +-
 .../templates/common/host_progress_popup.hbs    |    70 +-
 .../common/host_progress_popup_footer.hbs       |    10 +-
 .../app/templates/common/log_file_search.hbs    |    12 +-
 ambari-web/app/templates/common/log_tail.hbs    |     4 +-
 ambari-web/app/templates/common/metric.hbs      |    32 +-
 ambari-web/app/templates/common/modal_popup.hbs |    85 +-
 .../common/modal_popups/alerts_popup.hbs        |     7 +-
 .../modal_popups/cluster_check_dialog.hbs       |     8 +-
 .../modal_popups/confirmation_feedback.hbs      |    10 +-
 .../modal_popups/dependent_configs_list.hbs     |     4 +-
 .../modal_popups/hosts_table_list_popup.hbs     |     2 +-
 .../common/modal_popups/invalid_KDC_popup.hbs   |    12 +-
 .../common/modal_popups/log_tail_popup.hbs      |     6 +-
 .../common/modal_popups/logs_popup.hbs          |     4 +-
 .../common/modal_popups/prompt_popup.hbs        |    12 +-
 .../modal_popups/widget_browser_footer.hbs      |    13 +-
 .../modal_popups/widget_browser_popup.hbs       |    14 +-
 ambari-web/app/templates/common/progress.hbs    |    18 +-
 .../templates/common/rolling_restart_view.hbs   |    12 +-
 .../app/templates/common/selectable_popup.hbs   |     4 +-
 ambari-web/app/templates/common/settings.hbs    |    12 +-
 ambari-web/app/templates/common/time_range.hbs  |     2 +-
 .../templates/common/widget/gauge_widget.hbs    |    12 +-
 .../templates/common/widget/graph_widget.hbs    |    14 +-
 .../templates/common/widget/heatmap_widget.hbs  |     6 +-
 .../templates/common/widget/number_widget.hbs   |    12 +-
 .../templates/common/widget/template_widget.hbs |    12 +-
 ambari-web/app/templates/experimental.hbs       |    12 +-
 ambari-web/app/templates/installer.hbs          |     8 +-
 ambari-web/app/templates/login.hbs              |    20 +-
 ambari-web/app/templates/main.hbs               |     4 +-
 ambari-web/app/templates/main/admin.hbs         |     8 +-
 .../hawq/activateStandby/step2.hbs              |     6 +-
 .../hawq/activateStandby/wizard.hbs             |     8 +-
 .../highAvailability/hawq/addStandby/step3.hbs  |     4 +-
 .../highAvailability/hawq/addStandby/wizard.hbs |     8 +-
 .../hawq/removeStandby/step2.hbs                |     4 +-
 .../hawq/removeStandby/wizard.hbs               |     8 +-
 .../nameNode/rollbackHA/rollback_wizard.hbs     |     8 +-
 .../admin/highAvailability/nameNode/step1.hbs   |    10 +-
 .../admin/highAvailability/nameNode/step3.hbs   |    18 +-
 .../admin/highAvailability/nameNode/step4.hbs   |     2 +-
 .../admin/highAvailability/nameNode/wizard.hbs  |     8 +-
 .../highAvailability/rangerAdmin/step1.hbs      |    10 +-
 .../highAvailability/rangerAdmin/step3.hbs      |     4 +-
 .../highAvailability/rangerAdmin/wizard.hbs     |     8 +-
 .../highAvailability/resourceManager/step3.hbs  |     4 +-
 .../highAvailability/resourceManager/wizard.hbs |     8 +-
 .../app/templates/main/admin/kerberos.hbs       |     4 +-
 .../templates/main/admin/kerberos/disable.hbs   |     2 +-
 .../kerberos/notify_security_off_popup.hbs      |     2 +-
 .../app/templates/main/admin/kerberos/step1.hbs |    14 +-
 .../app/templates/main/admin/kerberos/step2.hbs |     2 +-
 .../app/templates/main/admin/kerberos/step3.hbs |    18 +-
 .../app/templates/main/admin/kerberos/step4.hbs |     2 +-
 .../app/templates/main/admin/kerberos/step5.hbs |     4 +-
 .../templates/main/admin/kerberos/wizard.hbs    |    10 +-
 .../templates/main/admin/serviceAccounts.hbs    |     2 +-
 .../templates/main/admin/service_auto_start.hbs |    32 +-
 .../admin/stack_upgrade/edit_repositories.hbs   |    26 +-
 .../admin/stack_upgrade/failed_hosts_modal.hbs  |    32 +-
 .../main/admin/stack_upgrade/services.hbs       |     6 +-
 .../stack_upgrade/stack_upgrade_wizard.hbs      |    56 +-
 .../upgrade_configs_merge_table.hbs             |     2 +-
 .../main/admin/stack_upgrade/upgrade_group.hbs  |    20 +-
 .../admin/stack_upgrade/upgrade_history.hbs     |     9 +-
 .../stack_upgrade/upgrade_history_details.hbs   |     8 +-
 .../admin/stack_upgrade/upgrade_options.hbs     |    20 +-
 .../main/admin/stack_upgrade/upgrade_task.hbs   |    33 +-
 .../admin/stack_upgrade/upgrade_version_box.hbs |    14 +-
 .../stack_upgrade/upgrade_version_column.hbs    |     2 +-
 .../main/admin/stack_upgrade/versions.hbs       |    16 +-
 ambari-web/app/templates/main/alerts.hbs        |    11 +-
 .../add_alert_definition.hbs                    |     8 +-
 .../main/alerts/add_alert_definition/step2.hbs  |     2 +-
 .../main/alerts/add_alert_definition/step3.hbs  |     4 +-
 ...ustom_config_to_alert_notification_popup.hbs |    16 +-
 .../alerts/add_definition_to_group_popup.hbs    |   129 +-
 .../main/alerts/alert_definitions_actions.hbs   |     2 +-
 .../app/templates/main/alerts/configs.hbs       |    50 +-
 .../alerts/configs/alert_config_parameter.hbs   |    19 +-
 .../alerts/configs/alert_config_text_area.hbs   |    20 +
 .../alerts/configs/alert_config_text_field.hbs  |    12 +-
 .../alerts/configs/alert_config_threshold.hbs   |    30 +-
 .../main/alerts/create_alert_notification.hbs   |   256 +-
 .../main/alerts/create_new_alert_group.hbs      |    14 +-
 .../main/alerts/definition_details.hbs          |    95 +-
 .../main/alerts/manage_alert_groups_popup.hbs   |   148 +-
 .../alerts/manage_alert_notifications_popup.hbs |    72 +-
 .../app/templates/main/charts/heatmap.hbs       |    10 +-
 .../templates/main/charts/heatmap_dropdown.hbs  |     6 +-
 .../app/templates/main/charts/linear_time.hbs   |     4 +-
 ambari-web/app/templates/main/dashboard.hbs     |     6 +-
 .../templates/main/dashboard/config_history.hbs |     9 +-
 .../main/dashboard/edit_widget_popup.hbs        |    28 +-
 .../edit_widget_popup_single_threshold.hbs      |    20 +-
 .../main/dashboard/plus_button_filter.hbs       |    12 +-
 .../app/templates/main/dashboard/widgets.hbs    |    50 +-
 .../main/dashboard/widgets/cluster_metrics.hbs  |    14 +-
 .../main/dashboard/widgets/hbase_links.hbs      |    14 +-
 .../main/dashboard/widgets/hdfs_links.hbs       |    14 +-
 .../main/dashboard/widgets/pie_chart.hbs        |    16 +-
 .../main/dashboard/widgets/simple_text.hbs      |    16 +-
 .../templates/main/dashboard/widgets/uptime.hbs |    12 +-
 .../main/dashboard/widgets/yarn_links.hbs       |    14 +-
 ambari-web/app/templates/main/host.hbs          |    20 +-
 ambari-web/app/templates/main/host/add.hbs      |    11 +-
 .../app/templates/main/host/addHost/step4.hbs   |    15 +-
 .../main/host/bulk_operation_confirm_popup.hbs  |     2 +-
 .../templates/main/host/bulk_operation_menu.hbs |     4 +-
 .../templates/main/host/combo_search_box.hbs    |     2 +-
 ambari-web/app/templates/main/host/configs.hbs  |     6 +-
 .../app/templates/main/host/decommission.hbs    |     9 +-
 .../main/host/delete_hosts_dry_run_popup.hbs    |    14 +-
 .../templates/main/host/delete_hosts_popup.hbs  |     8 +-
 .../main/host/delete_hosts_result_popup.hbs     |    14 +-
 ambari-web/app/templates/main/host/details.hbs  |     8 +-
 .../main/host/details/deleteComponentPopup.hbs  |    14 +-
 .../main/host/details/doDeleteHostPopup.hbs     |    18 +-
 .../main/host/details/host_component.hbs        |    14 +-
 .../details/raiseDeleteComponentErrorPopup.hbs  |     6 +-
 .../app/templates/main/host/host_alerts.hbs     |    11 +-
 .../app/templates/main/host/log_metrics.hbs     |     4 +-
 ambari-web/app/templates/main/host/logs.hbs     |     9 +-
 .../app/templates/main/host/rack_id_popup.hbs   |     6 +-
 .../app/templates/main/host/stack_versions.hbs  |    11 +-
 ambari-web/app/templates/main/host/summary.hbs  |   264 +-
 ambari-web/app/templates/main/menu_item.hbs     |     6 +-
 ambari-web/app/templates/main/service.hbs       |     6 +-
 ambari-web/app/templates/main/service/add.hbs   |    10 +-
 .../main/service/all_services_actions.hbs       |    14 +-
 .../app/templates/main/service/info/configs.hbs |     6 +-
 .../main/service/info/configs_save_popup.hbs    |     4 +-
 .../service/info/confirm_delete_service.hbs     |     2 +-
 .../main/service/info/heatmap_dropdown.hbs      |     4 +-
 .../flume/flume_agent_metrics_section.hbs       |    26 +-
 .../info/metrics/hive/hive_quick_links.hbs      |     4 +-
 .../main/service/info/save_popup_footer.hbs     |     4 +-
 .../main/service/info/service_alert_popup.hbs   |     9 +-
 .../app/templates/main/service/info/summary.hbs |    14 +-
 ambari-web/app/templates/main/service/item.hbs  |    10 +-
 .../manage_configuration_groups_popup.hbs       |   151 +-
 .../app/templates/main/service/menu_item.hbs    |    15 +-
 .../templates/main/service/new_config_group.hbs |    30 +-
 .../app/templates/main/service/reassign.hbs     |     8 +-
 .../templates/main/service/reassign/step3.hbs   |     2 +-
 .../app/templates/main/service/reconfigure.hbs  |     4 +-
 .../app/templates/main/service/service.hbs      |     4 +-
 .../templates/main/service/services/flume.hbs   |    10 +-
 .../templates/main/service/services/hbase.hbs   |     2 +-
 .../templates/main/service/services/hdfs.hbs    |     2 +-
 .../main/service/services/mapreduce2.hbs        |     4 +-
 .../templates/main/service/services/oozie.hbs   |     4 +-
 .../templates/main/service/services/storm.hbs   |     2 +-
 .../templates/main/service/services/yarn.hbs    |     2 +-
 .../main/service/services/zookeeper.hbs         |     4 +-
 .../main/service/widgets/create/expression.hbs  |    39 +-
 .../main/service/widgets/create/step1.hbs       |     8 +-
 .../main/service/widgets/create/step2.hbs       |    10 +-
 .../service/widgets/create/step2_add_metric.hbs |     6 +-
 .../main/service/widgets/create/step2_graph.hbs |     4 +-
 .../service/widgets/create/step2_template.hbs   |     2 +-
 .../main/service/widgets/create/step3.hbs       |    38 +-
 .../create/widget_property_threshold.hbs        |    16 +-
 .../main/service/widgets/create/wizard.hbs      |     8 +-
 .../app/templates/main/service/widgets/edit.hbs |     8 +-
 ambari-web/app/templates/utils/ajax.hbs         |     4 +-
 ...onfig_launch_switch_config_group_of_host.hbs |    11 +-
 .../controls_service_config_radio_buttons.hbs   |    10 +-
 ...trols_service_config_textfield_with_unit.hbs |     2 +-
 ambari-web/app/templates/wizard/step0.hbs       |    10 +-
 ambari-web/app/templates/wizard/step1.hbs       |   138 +-
 .../app/templates/wizard/step1/vdf_upload.hbs   |    14 +-
 .../wizard/step1_addLocalRepository.hbs         |    40 +-
 ambari-web/app/templates/wizard/step2.hbs       |   179 +-
 ambari-web/app/templates/wizard/step3.hbs       |    31 +-
 .../step3/step3_host_warning_popup_footer.hbs   |    10 +-
 .../wizard/step3/step3_host_warnings_popup.hbs  |    61 +-
 ambari-web/app/templates/wizard/step4.hbs       |    16 +-
 .../step4/step4_ranger_requirements_popup.hbs   |     7 +-
 ambari-web/app/templates/wizard/step6.hbs       |    33 +-
 .../wizard/step6/step6_issues_popup.hbs         |     2 +-
 ambari-web/app/templates/wizard/step7.hbs       |     4 +-
 ambari-web/app/templates/wizard/step8.hbs       |     2 +-
 .../templates/wizard/step8/step8_log_popup.hbs  |     2 +-
 ambari-web/app/templates/wizard/step9.hbs       |    29 +-
 .../wizard/step9/step9HostTasksLogPopup.hbs     |     8 +-
 .../wizard/step9/step9_install_host_popup.hbs   |     4 +-
 ambari-web/app/utils/bootstrap_reopen.js        |    42 +
 ambari-web/app/utils/ember_reopen.js            |     3 +-
 ambari-web/app/utils/handlebars_helpers.js      |     2 +-
 ambari-web/app/utils/helper.js                  |    14 +-
 ambari-web/app/utils/host_progress_popup.js     |    57 +-
 ambari-web/app/utils/hosts.js                   |     3 +-
 ambari-web/app/utils/load_timer.js              |     4 +-
 .../common/assign_master_components_view.js     |     5 +-
 .../app/views/common/chart/linear_time.js       |    10 +-
 .../views/common/configs/config_history_flow.js |     6 +-
 .../app/views/common/configs/controls_view.js   |     2 +-
 .../views/common/configs/service_config_view.js |     2 +-
 .../configs/service_configs_by_category_view.js |    16 +-
 .../widgets/checkbox_config_widget_view.js      |     6 +-
 .../configs/widgets/config_widget_view.js       |     4 +-
 .../widgets/directory_config_widget_view.js     |     2 +-
 .../configs/widgets/label_config_widget_view.js |     3 +-
 .../widgets/string_config_widget_view.js        |     2 +-
 .../widgets/textfield_config_widget_view.js     |     3 +-
 ambari-web/app/views/common/controls_view.js    |    79 +-
 .../app/views/common/filter_combo_cleanable.js  |     2 +-
 ambari-web/app/views/common/filter_combobox.js  |     2 +-
 ambari-web/app/views/common/filter_view.js      |     4 +-
 .../views/common/helpers/status_icon_view.js    |    30 +-
 ambari-web/app/views/common/modal_popup.js      |    16 +
 .../config_validation_popup.js                  |     3 +-
 .../dependent_configs_list_popup.js             |     3 +-
 .../modal_popups/log_file_search_popup.js       |     3 +-
 .../views/common/modal_popups/log_tail_popup.js |     3 +-
 .../app/views/common/progress_bar_view.js       |    16 +-
 ambari-web/app/views/common/table_view.js       |    93 +-
 .../hawq/activateStandby/step3_view.js          |     2 +-
 .../hawq/addStandby/step4_view.js               |     2 +-
 .../hawq/removeStandby/step3_view.js            |     2 +-
 .../highAvailability/nameNode/step1_view.js     |     2 +-
 .../admin/highAvailability/progress_view.js     |    12 +-
 .../resourceManager/step4_view.js               |     2 +-
 .../views/main/admin/stack_and_upgrade_view.js  |     3 +-
 .../stack_upgrade/failed_hosts_modal_view.js    |     4 +-
 .../admin/stack_upgrade/upgrade_group_view.js   |     2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |     3 +-
 .../stack_upgrade/upgrade_version_box_view.js   |    11 +-
 .../upgrade_version_column_view.js              |     6 +-
 .../app/views/main/alert_definitions_view.js    |     2 +-
 .../main/alerts/definition_configs_view.js      |    28 +-
 .../main/alerts/definition_details_view.js      |     2 +-
 ambari-web/app/views/main/dashboard/widget.js   |     3 +-
 .../dashboard/widgets/cluster_metrics_widget.js |     4 +-
 ambari-web/app/views/main/host.js               |     1 +
 ambari-web/app/views/main/host/details.js       |    10 +-
 .../main/host/details/host_component_view.js    |     4 +-
 .../views/main/host/hosts_table_menu_view.js    |     2 -
 .../app/views/main/host/stack_versions_view.js  |     2 +-
 ambari-web/app/views/main/menu.js               |    38 +-
 .../app/views/main/service/info/summary.js      |    14 +-
 ambari-web/app/views/main/service/item.js       |    16 +-
 .../views/main/service/reassign/step4_view.js   |     2 +-
 .../views/main/service/reassign/step6_view.js   |     2 +-
 .../views/main/service/reassign/step7_view.js   |     2 +-
 .../app/views/main/service/reconfigure.js       |     8 +-
 ambari-web/app/views/main/service/service.js    |     2 +-
 .../service/widgets/create/expression_view.js   |     2 +-
 ambari-web/app/views/wizard/step1_view.js       |     3 +-
 .../wizard/step3/hostWarningPopupFooter_view.js |     2 +-
 ambari-web/app/views/wizard/step3_view.js       |     6 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |    12 +-
 ambari-web/app/views/wizard/step9_view.js       |    26 +-
 ambari-web/brunch-config.js                     |    17 +-
 ambari-web/karma.conf.js                        |     4 +-
 ambari-web/package.json                         |     3 +-
 ambari-web/test/controllers/application_test.js |    12 -
 ambari-web/test/controllers/installer_test.js   |     6 +-
 .../admin/stack_and_upgrade_controller_test.js  |     6 +-
 .../controllers/main/charts/heatmap_test.js     |    12 +-
 .../test/models/alerts/alert_definition_test.js |    14 +-
 ambari-web/test/models/authentication_test.js   |     4 +-
 ambari-web/test/models/hosts_test.js            |    16 +-
 ambari-web/test/utils/helper_test.js            |     4 +-
 .../configs/widgets/config_widget_view_test.js  |     2 +-
 .../test/views/common/progress_bar_view_test.js |    16 +-
 .../common/widget/gauge_widget_view_test.js     |     3 +-
 .../common/widget/graph_widget_view_test.js     |    72 +-
 .../highAvailability/progress_view_test.js      |    12 +-
 .../upgrade_version_box_view_test.js            |    22 +-
 .../host/details/host_component_view_test.js    |    10 +-
 .../decommissionable_test.js                    |     4 +-
 ambari-web/test/views/main/menu_test.js         |    96 +-
 ambari-web/test/views/main/service/item_test.js |   100 +-
 .../step3/hostWarningPopupFooter_view_test.js   |     4 +-
 ambari-web/test/views/wizard/step3_view_test.js |    10 +-
 .../wizard/step9/hostLogPopupBody_view_test.js  |    16 +-
 ambari-web/test/views/wizard/step9_view_test.js |    28 +-
 .../fonts/glyphicons-halflings-regular.eot      |   Bin 0 -> 20127 bytes
 .../fonts/glyphicons-halflings-regular.svg      |   288 +
 .../fonts/glyphicons-halflings-regular.ttf      |   Bin 0 -> 45404 bytes
 .../fonts/glyphicons-halflings-regular.woff     |   Bin 0 -> 23424 bytes
 .../fonts/glyphicons-halflings-regular.woff2    |   Bin 0 -> 18028 bytes
 ambari-web/vendor/scripts/bootstrap-combobox.js |   560 +-
 .../vendor/scripts/bootstrap-datepicker.js      |     6 +
 ambari-web/vendor/scripts/bootstrap.js          |  3284 ++---
 ambari-web/vendor/scripts/ember-latest.js       |     2 +-
 ambari-web/vendor/scripts/jquery-1.7.2.min.js   |     4 -
 ambari-web/vendor/scripts/jquery-1.9.1.js       |  9597 +++++++++++++++
 ambari-web/vendor/scripts/jquery-migrate.js     |   752 ++
 ambari-web/vendor/styles/bootstrap.css          | 10534 +++++++++--------
 .../theme/fonts/Roboto-Regular-webfont.eot      |   Bin 0 -> 79547 bytes
 .../theme/fonts/Roboto-Regular-webfont.svg      |  7606 ++++++++++++
 .../theme/fonts/Roboto-Regular-webfont.ttf      |   Bin 0 -> 234464 bytes
 .../theme/fonts/Roboto-Regular-webfont.woff     |   Bin 0 -> 105700 bytes
 406 files changed, 31468 insertions(+), 11065 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index 906c059..f05016f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -345,9 +345,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-For jQuery 1.7.2 (ambari-web/vendor/scripts.jquery-1.7.2.min.js):
+For jQuery 1.9.1 (ambari-web/vendor/scripts.jquery-1.9.1.js):
 
-jQuery JavaScript Library v1.7.2
+jQuery JavaScript Library v1.9.1
 http://jquery.com/
 
 Copyright 2011, John Resig

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 53394a0..051daff 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -16,7 +16,12 @@
  * limitations under the License.
  */
 
+if (Ember.$.uuid === undefined) {
+  Ember.$.uuid = 0;
+}
+
 // Application bootstrapper
+require('utils/bootstrap_reopen');
 require('utils/ember_reopen');
 require('utils/ember_computed');
 var stringUtils = require('utils/string_utils');

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/assets/fonts/glyphicons-halflings-regular.eot
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/fonts/glyphicons-halflings-regular.eot b/ambari-web/app/assets/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..b93a495
Binary files /dev/null and b/ambari-web/app/assets/fonts/glyphicons-halflings-regular.eot differ