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/f923fd88 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f923fd88 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f923fd88 Branch: refs/heads/trunk Commit: f923fd880b49548bc1cc289e89c18039fc3552b0 Parents: 10f1f73 f1557e8 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Mon Sep 29 08:13:51 2014 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Mon Sep 29 08:13:51 2014 -0400 ---------------------------------------------------------------------- .../admin-web/app/scripts/services/Cluster.js | 2 +- .../resources/ui/admin-web/app/styles/main.css | 15 ++ .../admin-web/app/views/ambariViews/create.html | 2 +- .../admin-web/app/views/ambariViews/edit.html | 2 +- .../ui/admin-web/app/views/leftNavbar.html | 3 +- .../resources/ui/admin-web/app/views/main.html | 4 +- ambari-agent/pom.xml | 3 +- ambari-server/pom.xml | 8 +- ambari-server/src/main/assemblies/server.xml | 3 +- .../ambari/server/controller/AmbariServer.java | 2 +- .../server/orm/entities/ViewInstanceEntity.java | 34 +-- .../AmbariAuthorizationFilter.java | 91 ++++++- .../server/security/authorization/Users.java | 3 +- .../server/upgrade/UpgradeCatalog170.java | 139 ++++++---- .../apache/ambari/server/view/ViewRegistry.java | 26 +- .../GANGLIA/configuration/ganglia-env.xml | 2 +- .../services/GANGLIA/package/scripts/params.py | 7 +- .../services/OOZIE/configuration/oozie-env.xml | 2 +- .../services/OOZIE/package/files/oozieSmoke2.sh | 27 +- .../services/OOZIE/package/scripts/oozie.py | 8 +- .../OOZIE/package/scripts/oozie_service.py | 17 +- .../services/OOZIE/package/scripts/params.py | 30 ++- .../OOZIE/package/scripts/service_check.py | 5 +- .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 5 +- .../services/SLIDER/package/scripts/params.py | 6 +- .../orm/entities/ViewInstanceEntityTest.java | 19 +- .../AmbariAuthorizationFilterTest.java | 266 ++++++++++++++++++- .../security/authorization/TestUsers.java | 1 + .../server/upgrade/UpgradeCatalog170Test.java | 63 ++++- .../ambari/server/upgrade/UpgradeTest.java | 11 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 12 + .../stacks/2.0.6/OOZIE/test_service_check.py | 3 +- .../service/manage_config_groups_controller.js | 57 +++- ambari-web/app/controllers/wizard.js | 1 + .../app/controllers/wizard/step7_controller.js | 14 +- ambari-web/app/models/config_group.js | 5 + .../manage_configuration_groups_popup.hbs | 2 +- contrib/views/jobs/src/main/resources/view.xml | 4 +- .../slider/SliderAppsViewControllerImpl.java | 4 +- .../app/controllers/slider_apps_controller.js | 3 +- .../ui/app/controllers/slider_controller.js | 11 +- .../ui/app/mappers/slider_apps_mapper.js | 7 +- .../ui/app/templates/unavailable_apps.hbs | 3 + .../src/main/resources/ui/app/translations.js | 2 +- .../views/slider/src/main/resources/view.xml | 2 +- docs/pom.xml | 16 +- pom.xml | 1 + 47 files changed, 741 insertions(+), 212 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f923fd88/ambari-agent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f923fd88/ambari-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f923fd88/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f923fd88/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java index 338fede,d86bf35..f8f6f5b --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java @@@ -69,8 -70,8 +70,9 @@@ import org.apache.ambari.server.state.C import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigHelper; +import org.apache.ambari.server.state.alert.Scope; import org.apache.ambari.server.utils.StageUtils; + import org.apache.ambari.server.view.ViewRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
