You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/23 13:29:37 UTC
[42/42] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd322009
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd322009
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd322009
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: fd3220099abd7e990dc18fa9ff9b2758554bb2cf
Parents: f760516 0dbc797
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Jun 23 09:28:38 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jun 23 09:28:38 2017 -0400
----------------------------------------------------------------------
.../ambari-metrics/datasource.js | 5 +-
.../actionmanager/ActionDBAccessorImpl.java | 17 +
.../apache/ambari/server/orm/DBAccessor.java | 41 +-
.../ambari/server/orm/DBAccessorImpl.java | 113 +-
.../server/orm/helpers/dbms/DbmsHelper.java | 10 +
.../orm/helpers/dbms/GenericDbmsHelper.java | 12 +
.../server/orm/helpers/dbms/H2Helper.java | 10 +
.../server/upgrade/UpgradeCatalog251.java | 3 +-
.../ambari/server/orm/DBAccessorImplTest.java | 62 +
ambari-web/app/messages.js | 34 +-
ambari-web/app/styles/alerts.less | 52 +-
ambari-web/app/styles/application.less | 91 +-
ambari-web/app/styles/bootstrap_overrides.less | 18 +-
ambari-web/app/styles/dashboard.less | 9 +-
.../app/styles/enhanced_service_dashboard.less | 79 +-
.../templates/common/export_metrics_menu.hbs | 16 +-
.../templates/common/widget/gauge_widget.hbs | 33 +-
.../templates/common/widget/graph_widget.hbs | 44 +-
.../templates/common/widget/number_widget.hbs | 33 +-
.../templates/common/widget/template_widget.hbs | 35 +-
.../main/dashboard/widgets/cluster_metrics.hbs | 19 +-
.../app/templates/main/service/info/summary.hbs | 91 +-
.../main/service/info/summary/base.hbs | 13 +-
.../service/info/summary/client_components.hbs | 10 +-
.../service/info/summary/master_components.hbs | 26 +-
.../service/info/summary/slave_components.hbs | 12 +-
ambari-web/app/templates/main/service/item.hbs | 40 +-
.../templates/main/service/services/hbase.hbs | 128 +-
.../templates/main/service/services/hdfs.hbs | 270 +-
.../templates/main/service/services/hive.hbs | 13 +-
.../templates/main/service/services/ranger.hbs | 59 +-
.../templates/main/service/services/storm.hbs | 118 +-
.../templates/main/service/services/yarn.hbs | 194 +-
.../app/views/common/quick_view_link_view.js | 14 +-
.../views/common/widget/gauge_widget_view.js | 14 +-
.../app/views/main/service/info/summary.js | 24 +
ambari-web/app/views/main/service/service.js | 13 +-
.../app/views/main/service/services/hbase.js | 2 +-
.../app/views/main/service/services/hdfs.js | 19 +-
.../app/views/main/service/services/yarn.js | 3 +-
.../common/widget/gauge_widget_view_test.js | 2 +-
.../src/main/resources/ui/app/styles/app.scss | 1 +
contrib/views/pom.xml | 1 -
contrib/views/slider/docs/index.md | 164 -
contrib/views/slider/gzip-content.cmd | 17 -
contrib/views/slider/gzip-content.ps1 | 81 -
contrib/views/slider/pom.xml | 463 -
.../apache/ambari/view/slider/AlertField.java | 62 -
.../apache/ambari/view/slider/AlertState.java | 40 -
.../ambari/view/slider/MetricsHolder.java | 44 -
.../apache/ambari/view/slider/SliderApp.java | 198 -
.../ambari/view/slider/SliderAppComponent.java | 62 -
.../ambari/view/slider/SliderAppType.java | 107 -
.../view/slider/SliderAppTypeComponent.java | 103 -
.../slider/SliderAppTypesResourceProvider.java | 94 -
.../ambari/view/slider/SliderAppsAlerts.java | 127 -
.../view/slider/SliderAppsConfiguration.java | 52 -
.../view/slider/SliderAppsResourceProvider.java | 124 -
.../view/slider/SliderAppsViewController.java | 112 -
.../slider/SliderAppsViewControllerImpl.java | 1510 -
.../apache/ambari/view/slider/TemporalInfo.java | 48 -
.../apache/ambari/view/slider/ViewStatus.java | 72 -
.../view/slider/clients/AmbariClient.java | 58 -
.../view/slider/clients/AmbariCluster.java | 52 -
.../view/slider/clients/AmbariClusterInfo.java | 40 -
.../slider/clients/AmbariHostComponent.java | 49 -
.../view/slider/clients/AmbariHostInfo.java | 32 -
.../view/slider/clients/AmbariService.java | 36 -
.../view/slider/clients/AmbariServiceInfo.java | 51 -
.../slider/rest/SliderAppTypesResource.java | 54 -
.../view/slider/rest/SliderAppsResource.java | 163 -
.../view/slider/rest/ViewStatusResource.java | 40 -
.../slider/rest/client/AmbariHttpClient.java | 233 -
.../view/slider/rest/client/BaseHttpClient.java | 157 -
.../slider/rest/client/JMXMetricHolder.java | 50 -
.../ambari/view/slider/rest/client/Metric.java | 158 -
.../slider/rest/client/SliderAppJmxHelper.java | 205 -
.../rest/client/SliderAppMasterClient.java | 324 -
.../rest/client/SliderAppMetricsHelper.java | 159 -
.../view/slider/rest/client/TimelineMetric.java | 172 -
.../slider/rest/client/TimelineMetrics.java | 101 -
.../rest/client/URLStreamProviderBasicAuth.java | 105 -
.../slider/src/main/resources/slider.properties | 19 -
.../slider/src/main/resources/ui/.gitignore | 31 -
.../views/slider/src/main/resources/ui/LICENSE | 21 -
.../slider/src/main/resources/ui/README.md | 122 -
.../src/main/resources/ui/app/assets/404.html | 175 -
.../app/assets/apple-touch-icon-precomposed.png | Bin 1226 -> 0 bytes
.../resources/ui/app/assets/crossdomain.xml | 31 -
.../resources/ui/app/assets/data/apps/apps.json | 1320 -
.../ui/app/assets/data/apptypes/all_fields.json | 642 -
.../ui/app/assets/data/metrics/metric.json | 946 -
.../ui/app/assets/data/metrics/metric2.json | 3838 --
.../ui/app/assets/data/metrics/metric3.json | 1856 -
.../ui/app/assets/data/metrics/metric4.json | 968 -
.../ui/app/assets/data/resource/empty_json.json | 1 -
.../data/resource/slider-properties-2.json | 9 -
.../assets/data/resource/slider-properties.json | 148 -
.../app/assets/data/resource/status_false.json | 8 -
.../app/assets/data/resource/status_true.json | 5 -
.../main/resources/ui/app/assets/favicon.ico | Bin 766 -> 0 bytes
.../ui/app/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
.../ui/app/assets/font/fontawesome-webfont.svg | 399 -
.../ui/app/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
.../ui/app/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
.../resources/ui/app/assets/images/.gitkeep | 0
.../ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes
.../ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 0 bytes
.../ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes
.../ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 0 bytes
.../ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 0 bytes
.../ui-bg_glass_75_ffffff_1x400.png | Bin 107 -> 0 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 0 bytes
.../ui-bg_inset-soft_95_fef1ec_1x100.png | Bin 123 -> 0 bytes
.../ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes
.../ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../ui-icons_454545_256x240.png | Bin 4369 -> 0 bytes
.../ui-icons_888888_256x240.png | Bin 4369 -> 0 bytes
.../ui-icons_cd0a0a_256x240.png | Bin 4369 -> 0 bytes
.../ui-icons_f6cf3b_256x240.png | Bin 8884 -> 0 bytes
.../src/main/resources/ui/app/assets/index.html | 46 -
.../ui/app/assets/javascripts/ember-qunit.js | 266 -
.../ui/app/assets/javascripts/jquery.mockjax.js | 692 -
.../assets/javascripts/modernizr-2.6.2.min.js | 4 -
.../ui/app/assets/javascripts/qunit.js | 2495 -
.../ui/app/assets/javascripts/sinon-1.13.0.js | 5830 ---
.../app/assets/javascripts/sinon-qunit-1.0.0.js | 62 -
.../ui/app/assets/javascripts/tests.js | 29 -
.../ui/app/assets/stylesheets/qunit.css | 237 -
.../src/main/resources/ui/app/assets/tests.html | 46 -
.../main/resources/ui/app/components/.gitkeep | 0
.../ui/app/components/configSection.js | 164 -
.../src/main/resources/ui/app/config/app.js | 27 -
.../src/main/resources/ui/app/config/env.js | 33 -
.../src/main/resources/ui/app/config/router.js | 35 -
.../src/main/resources/ui/app/config/store.js | 23 -
.../main/resources/ui/app/controllers/.gitkeep | 0
.../app/controllers/application_controller.js | 27 -
.../createAppWizard/step1_controller.js | 251 -
.../createAppWizard/step2_controller.js | 136 -
.../createAppWizard/step3_controller.js | 250 -
.../createAppWizard/step4_controller.js | 176 -
.../controllers/create_app_wizard_controller.js | 122 -
.../slider_app/summary_controller.js | 27 -
.../ui/app/controllers/slider_app_controller.js | 472 -
.../app/controllers/slider_apps_controller.js | 35 -
.../ui/app/controllers/slider_controller.js | 138 -
.../ui/app/controllers/tooltip_controller.js | 19 -
.../src/main/resources/ui/app/helpers/.gitkeep | 0
.../src/main/resources/ui/app/helpers/ajax.js | 388 -
.../src/main/resources/ui/app/helpers/helper.js | 169 -
.../resources/ui/app/helpers/string_utils.js | 163 -
.../src/main/resources/ui/app/initialize.js | 171 -
.../ui/app/mappers/application_type.js | 162 -
.../src/main/resources/ui/app/mappers/mapper.js | 56 -
.../ui/app/mappers/slider_apps_mapper.js | 292 -
.../ui/app/mixins/ajax_error_handler.js | 82 -
.../resources/ui/app/mixins/run_periodically.js | 109 -
.../main/resources/ui/app/mixins/with_panels.js | 53 -
.../src/main/resources/ui/app/models/.gitkeep | 0
.../resources/ui/app/models/config_property.js | 47 -
.../src/main/resources/ui/app/models/host.js | 33 -
.../main/resources/ui/app/models/slider_app.js | 207 -
.../resources/ui/app/models/slider_app_alert.js | 149 -
.../ui/app/models/slider_app_component.js | 65 -
.../resources/ui/app/models/slider_app_type.js | 64 -
.../ui/app/models/slider_app_type_component.js | 63 -
.../resources/ui/app/models/slider_config.js | 45 -
.../ui/app/models/slider_quick_link.js | 33 -
.../resources/ui/app/models/typed_property.js | 38 -
.../ui/app/routes/create_app_wizard.js | 54 -
.../src/main/resources/ui/app/routes/main.js | 75 -
.../src/main/resources/ui/app/styles/app.less | 303 -
.../resources/ui/app/styles/application.less | 23 -
.../resources/ui/app/styles/application.styl | 18 -
.../resources/ui/app/styles/apps-table.less | 320 -
.../main/resources/ui/app/styles/common.less | 109 -
.../resources/ui/app/styles/old-bootstrap.less | 164 -
.../main/resources/ui/app/styles/wizard.less | 232 -
.../resources/ui/app/templates/application.hbs | 56 -
.../ui/app/templates/common/ajax_error.hbs | 24 -
.../ui/app/templates/common/app_tooltip.hbs | 24 -
.../resources/ui/app/templates/common/chart.hbs | 26 -
.../ui/app/templates/common/config.hbs | 37 -
.../ui/app/templates/components/.gitkeep | 0
.../app/templates/components/configSection.hbs | 78 -
.../ui/app/templates/createAppWizard.hbs | 43 -
.../ui/app/templates/createAppWizard/step1.hbs | 192 -
.../ui/app/templates/createAppWizard/step2.hbs | 62 -
.../ui/app/templates/createAppWizard/step3.hbs | 37 -
.../ui/app/templates/createAppWizard/step4.hbs | 41 -
.../main/resources/ui/app/templates/index.hbs | 21 -
.../resources/ui/app/templates/slider_app.hbs | 70 -
.../ui/app/templates/slider_app/configs.hbs | 40 -
.../slider_app/destroy/destroy_popup.hbs | 20 -
.../slider_app/destroy/destroy_popup_footer.hbs | 28 -
.../ui/app/templates/slider_app/flex_popup.hbs | 40 -
.../ui/app/templates/slider_app/summary.hbs | 135 -
.../resources/ui/app/templates/slider_apps.hbs | 87 -
.../ui/app/templates/slider_title_tooltip.hbs | 27 -
.../ui/app/templates/unavailable_apps.hbs | 22 -
.../src/main/resources/ui/app/translations.js | 169 -
.../src/main/resources/ui/app/views/.gitkeep | 0
.../resources/ui/app/views/application_view.js | 70 -
.../resources/ui/app/views/common/chart_view.js | 914 -
.../ui/app/views/common/config_set_view.js | 57 -
.../ui/app/views/common/filter_view.js | 370 -
.../resources/ui/app/views/common/sort_view.js | 206 -
.../resources/ui/app/views/common/table_view.js | 418 -
.../ui/app/views/createAppWizard/step1_view.js | 47 -
.../ui/app/views/createAppWizard/step2_view.js | 33 -
.../ui/app/views/createAppWizard/step3_view.js | 25 -
.../ui/app/views/createAppWizard/step4_view.js | 24 -
.../ui/app/views/create_app_wizard_view.js | 80 -
.../ui/app/views/slider_app/configs_view.js | 57 -
.../slider_app/destroy_modal_footer_view.js | 41 -
.../app/views/slider_app/destroy_popup_view.js | 37 -
.../views/slider_app/metrics/app_metric_view.js | 77 -
.../views/slider_app/metrics/metric2_view.js | 63 -
.../views/slider_app/metrics/metric3_view.js | 61 -
.../views/slider_app/metrics/metric4_view.js | 54 -
.../app/views/slider_app/metrics/metric_view.js | 70 -
.../ui/app/views/slider_app/summary_view.js | 141 -
.../resources/ui/app/views/slider_app_view.js | 30 -
.../resources/ui/app/views/slider_apps_view.js | 175 -
.../slider/src/main/resources/ui/config.js | 123 -
.../main/resources/ui/envs/development/env.js | 21 -
.../main/resources/ui/envs/production/env.js | 21 -
.../arraycontroller/arraycontroller.js.hbs | 23 -
.../generators/arraycontroller/generator.json | 10 -
.../ui/generators/component/component.hbs.hbs | 19 -
.../ui/generators/component/component.js.hbs | 23 -
.../ui/generators/component/generator.json | 14 -
.../ui/generators/controller/controller.js.hbs | 23 -
.../ui/generators/controller/generator.json | 10 -
.../ui/generators/helper/generator.json | 10 -
.../ui/generators/helper/helper.js.hbs | 24 -
.../ui/generators/model/generator.json | 10 -
.../resources/ui/generators/model/model.js.hbs | 24 -
.../ui/generators/route/generator.json | 10 -
.../resources/ui/generators/route/route.js.hbs | 25 -
.../ui/generators/template/generator.json | 10 -
.../ui/generators/template/template.hbs.hbs | 19 -
.../resources/ui/generators/view/generator.json | 10 -
.../resources/ui/generators/view/view.js.hbs | 23 -
.../slider/src/main/resources/ui/karma.conf.js | 94 -
.../slider/src/main/resources/ui/package.json | 38 -
.../slider/src/main/resources/ui/runner.js | 136 -
.../views/slider/src/main/resources/ui/setup.js | 78 -
.../slider/src/main/resources/ui/test/index.md | 28 -
.../ui/test/integration/pages/index_test.js | 127 -
.../integration/pages/slider_errors_test.js | 63 -
.../processes/create_new_app_test.js | 358 -
.../createAppWizard/step1_controller_test.js | 431 -
.../createAppWizard/step2_controller_test.js | 403 -
.../createAppWizard/step3_controller_test.js | 421 -
.../createAppWizard/step4_controller_test.js | 440 -
.../create_app_wizard_controller_test.js | 201 -
.../slider_app/summary_controller_test.js | 36 -
.../controllers/slider_app_controller_test.js | 607 -
.../controllers/slider_apps_controller_test.js | 58 -
.../unit/controllers/slider_controller_test.js | 140 -
.../unit/mappers/slider_apps_mapper_test.js | 85 -
.../unit/models/slider_app_component_test.js | 51 -
.../ui/test/unit/models/slider_app_test.js | 95 -
.../test/unit/views/common/table_view_test.js | 35 -
.../unit/views/slider_app/summary_view_test.js | 68 -
.../ui/vendor/scripts/common/bootstrap.js | 1951 -
.../ui/vendor/scripts/common/bs-basic.min.js | 1 -
.../ui/vendor/scripts/common/bs-button.min.js | 1 -
.../ui/vendor/scripts/common/bs-core.min.js | 1 -
.../ui/vendor/scripts/common/bs-modal.min.js | 1 -
.../ui/vendor/scripts/common/bs-nav.min.js | 1 -
.../ui/vendor/scripts/common/bs-popover.min.js | 1 -
.../vendor/scripts/common/console-polyfill.js | 13 -
.../ui/vendor/scripts/common/cubism.v1.js | 1085 -
.../resources/ui/vendor/scripts/common/d3.v2.js | 7033 ---
.../vendor/scripts/common/ember-i18n-1.4.1.js | 199 -
.../ui/vendor/scripts/common/handlebars.js | 2746 --
.../ui/vendor/scripts/common/jquery.js | 8829 ----
.../ui/vendor/scripts/common/jquery.timeago.js | 214 -
.../ui/vendor/scripts/common/jquery.ui.core.js | 334 -
.../ui/vendor/scripts/common/jquery.ui.mouse.js | 175 -
.../vendor/scripts/common/jquery.ui.sortable.js | 1088 -
.../vendor/scripts/common/jquery.ui.widget.js | 276 -
.../ui/vendor/scripts/common/moment.min.js | 7 -
.../ui/vendor/scripts/common/rickshaw.js | 2659 -
.../resources/ui/vendor/scripts/common/tv4.js | 1605 -
.../ui/vendor/scripts/development/ember-data.js | 10620 ----
.../ui/vendor/scripts/development/ember.js | 43235 -----------------
.../ui/vendor/scripts/production/ember-data.js | 10626 ----
.../ui/vendor/scripts/production/ember.js | 41620 ----------------
.../resources/ui/vendor/styles/bootstrap.css | 5785 ---
.../main/resources/ui/vendor/styles/cubism.css | 82 -
.../ui/vendor/styles/font-awesome-ie7.css | 1203 -
.../resources/ui/vendor/styles/font-awesome.css | 1479 -
.../jquery-ui-1.8.16.custom.css | 1320 -
.../resources/ui/vendor/styles/rickshaw.css | 307 -
.../src/main/resources/view.log4j.properties | 27 -
.../views/slider/src/main/resources/view.xml | 82 -
.../ambari/view/slider/SliderClientTest.java | 31 -
.../rest/client/SliderAppMasterClientTest.java | 177 -
302 files changed, 1190 insertions(+), 185788 deletions(-)
----------------------------------------------------------------------