Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6cc0587 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6cc0587 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6cc0587 Branch: refs/heads/branch-alerts-dev Commit: e6cc05872462d53f9b420837f129921d0e2e0b24 Parents: 7f86e75 802df76 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Mon Sep 22 10:47:55 2014 -0700 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Mon Sep 22 10:47:55 2014 -0700 ---------------------------------------------------------------------- ambari-server/pom.xml | 22 ++++ .../internal/ClientConfigResourceProvider.java | 33 ++++- .../internal/ConfigGroupResourceProvider.java | 15 ++- .../server/upgrade/UpgradeCatalog170.java | 68 +++++----- .../main/resources/slider_resources/README.txt | 17 +++ .../services/GANGLIA/package/scripts/params.py | 5 +- .../services/GANGLIA/package/scripts/params.py | 6 +- .../services/OOZIE/package/scripts/oozie.py | 10 +- .../services/OOZIE/package/scripts/params.py | 13 +- .../services/SQOOP/package/scripts/params.py | 2 + .../SQOOP/package/scripts/service_check.py | 1 + .../services/FALCON/package/scripts/falcon.py | 4 + .../services/STORM/configuration/storm-site.xml | 6 +- .../services/SLIDER/package/scripts/slider.py | 3 +- .../services/STORM/configuration/storm-site.xml | 6 +- .../ClientConfigResourceProviderTest.java | 9 +- .../ConfigGroupResourceProviderTest.java | 37 +++++- .../server/upgrade/UpgradeCatalog170Test.java | 125 ++++++++++++------- .../stacks/2.0.6/OOZIE/test_oozie_client.py | 18 +-- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 18 +-- .../stacks/2.0.6/SQOOP/test_service_check.py | 2 + .../stacks/2.1/FALCON/test_falcon_client.py | 4 + .../stacks/2.1/FALCON/test_falcon_server.py | 4 + .../stacks/2.2/SLIDER/test_slider_client.py | 4 +- .../main/dashboard/config_history_controller.js | 1 + ambari-web/app/controllers/main/service/item.js | 28 ++++- ambari-web/app/templates/main/host/details.hbs | 2 +- ambari-web/app/templates/main/service/item.hbs | 13 +- ambari-web/app/views/common/filter_view.js | 74 ++++++++++- .../views/main/dashboard/config_history_view.js | 10 +- ambari-web/app/views/main/service/item.js | 6 +- contrib/views/slider/docs/index.md | 63 ++++++++++ .../view/slider/SliderAppsViewController.java | 8 ++ .../slider/SliderAppsViewControllerImpl.java | 69 +++++----- .../assets/data/resource/slider-properties.json | 7 +- .../ui/app/controllers/slider_controller.js | 20 ++- .../src/main/resources/ui/app/helpers/ajax.js | 7 +- .../resources/ui/app/models/slider_config.js | 8 +- .../src/main/resources/ui/app/routes/main.js | 7 +- .../src/main/resources/ui/app/translations.js | 1 + .../views/slider/src/main/resources/view.xml | 25 ++++ 41 files changed, 596 insertions(+), 185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6cc0587/ambari-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6cc0587/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java ----------------------------------------------------------------------
