Merge branch 'trunk' into branch-alerts-dev
Conflicts:
ambari-server/conf/unix/ambari.properties
ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aaf05135
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aaf05135
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aaf05135
Branch: refs/heads/branch-alerts-dev
Commit: aaf051357de9493217fd5b2e05daa06c55a13132
Parents: 853497f 3355733
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Fri Sep 12 19:52:41 2014 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Fri Sep 12 19:52:41 2014 -0400
----------------------------------------------------------------------
.../main/resources/ui/admin-web/app/index.html | 7 +-
.../resources/ui/admin-web/app/scripts/app.js | 3 +-
.../controllers/ambariViews/ViewsEditCtrl.js | 7 +-
.../controllers/groups/GroupsEditCtrl.js | 8 +-
.../app/scripts/controllers/mainCtrl.js | 2 +-
.../scripts/controllers/users/UsersShowCtrl.js | 18 +-
.../ui/admin-web/app/scripts/i18n.config.js | 29 ++
.../resources/ui/admin-web/app/styles/main.css | 9 +
.../admin-web/app/views/ambariViews/edit.html | 10 +-
.../app/views/clusters/manageAccess.html | 2 +-
.../ui/admin-web/app/views/groups/edit.html | 4 +-
.../ui/admin-web/app/views/leftNavbar.html | 15 +-
.../ui/admin-web/app/views/users/show.html | 8 +-
.../src/main/resources/ui/admin-web/bower.json | 4 +-
.../libraries/providers/execute_hadoop.py | 9 +-
.../libraries/providers/hdfs_directory.py | 16 +-
.../libraries/resources/execute_hadoop.py | 1 +
.../libraries/resources/hdfs_directory.py | 1 +
ambari-server/conf/unix/ambari.properties | 2 +-
ambari-server/docs/api/v1/clusters-cluster.md | 284 +++++++-----
.../server/configuration/Configuration.java | 5 +-
.../internal/BaseBlueprintProcessor.java | 13 +-
.../ServiceConfigVersionResourceProvider.java | 2 +-
.../internal/StackAdvisorResourceProvider.java | 6 +-
.../server/upgrade/UpgradeCatalog170.java | 2 +
.../ambari/server/view/ViewArchiveUtility.java | 120 ++++++
.../ambari/server/view/ViewExtractor.java | 223 ++++++++++
.../apache/ambari/server/view/ViewRegistry.java | 429 ++++++-------------
ambari-server/src/main/python/ambari-server.py | 100 ++++-
.../src/main/resources/ganglia_properties.json | 40 ++
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 20 +-
.../hooks/before-INSTALL/scripts/params.py | 3 +-
.../hooks/before-START/files/checkForFormat.sh | 3 +
.../2.0.6/hooks/before-START/scripts/params.py | 25 +-
.../services/FLUME/package/scripts/flume.py | 2 +-
.../FLUME/package/scripts/flume_check.py | 2 +-
.../services/FLUME/package/scripts/params.py | 14 +-
.../HBASE/package/files/hbaseSmokeVerify.sh | 3 +-
.../services/HBASE/package/scripts/params.py | 37 +-
.../HBASE/package/scripts/service_check.py | 6 +-
.../HDFS/package/files/checkForFormat.sh | 4 +-
.../HDFS/package/scripts/hdfs_namenode.py | 15 +-
.../services/HDFS/package/scripts/namenode.py | 2 +-
.../services/HDFS/package/scripts/params.py | 34 +-
.../HDFS/package/scripts/service_check.py | 27 +-
.../2.0.6/services/HIVE/package/scripts/hcat.py | 6 +
.../HIVE/package/scripts/hcat_service_check.py | 8 +-
.../2.0.6/services/HIVE/package/scripts/hive.py | 2 +
.../HIVE/package/scripts/hive_service.py | 9 +-
.../HIVE/package/scripts/install_jars.py | 6 +-
.../services/HIVE/package/scripts/params.py | 73 ++--
.../package/templates/startHiveserver2.sh.j2 | 2 +-
.../services/OOZIE/configuration/oozie-env.xml | 2 +-
.../services/OOZIE/package/files/oozieSmoke2.sh | 8 +-
.../OOZIE/package/scripts/oozie_service.py | 4 +-
.../services/OOZIE/package/scripts/params.py | 24 +-
.../services/PIG/package/scripts/params.py | 20 +-
.../PIG/package/scripts/service_check.py | 10 +-
.../services/SQOOP/package/scripts/params.py | 10 +-
.../WEBHCAT/configuration/webhcat-env.xml | 2 +-
.../services/WEBHCAT/package/scripts/params.py | 41 +-
.../services/WEBHCAT/package/scripts/webhcat.py | 11 +-
.../services/YARN/package/scripts/params.py | 45 +-
.../YARN/package/scripts/resourcemanager.py | 5 +-
.../services/YARN/package/scripts/service.py | 2 +-
.../YARN/package/scripts/service_check.py | 3 +-
.../2.0.6/services/YARN/package/scripts/yarn.py | 14 +-
.../ZOOKEEPER/package/scripts/params.py | 17 +-
.../services/FALCON/package/scripts/params.py | 15 +-
.../services/STORM/package/scripts/params.py | 5 +-
.../main/resources/stacks/HDP/2.2/metainfo.xml | 23 +
.../resources/stacks/HDP/2.2/repos/repoinfo.xml | 82 ++++
.../stacks/HDP/2.2/role_command_order.json | 88 ++++
.../stacks/HDP/2.2/services/FALCON/metainfo.xml | 28 ++
.../stacks/HDP/2.2/services/FLUME/metainfo.xml | 40 ++
.../stacks/HDP/2.2/services/HBASE/metainfo.xml | 42 ++
.../services/HDFS/configuration/hadoop-env.xml | 29 ++
.../services/HDFS/configuration/hdfs-site.xml | 34 ++
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 68 +++
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 44 ++
.../services/OOZIE/configuration/oozie-site.xml | 45 ++
.../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 28 ++
.../stacks/HDP/2.2/services/PIG/metainfo.xml | 41 ++
.../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 29 ++
.../services/STORM/configuration/storm-env.xml | 29 ++
.../services/STORM/configuration/storm-site.xml | 54 +++
.../stacks/HDP/2.2/services/STORM/metainfo.xml | 29 ++
.../stacks/HDP/2.2/services/TEZ/metainfo.xml | 40 ++
.../WEBHCAT/configuration/webhcat-site.xml | 59 +++
.../HDP/2.2/services/WEBHCAT/metainfo.xml | 44 ++
.../YARN/configuration-mapred/mapred-site.xml | 36 ++
.../services/YARN/configuration/yarn-site.xml | 35 ++
.../stacks/HDP/2.2/services/YARN/metainfo.xml | 71 +++
.../HDP/2.2/services/ZOOKEEPER/metainfo.xml | 40 ++
.../AmbariPrivilegeResourceProviderTest.java | 2 +-
.../internal/BaseBlueprintProcessorTest.java | 413 ++++++++++++++++++
.../StackAdvisorResourceProviderTest.java | 76 ++++
.../ViewPrivilegeResourceProviderTest.java | 2 +-
...mbariLdapAuthenticationProviderBaseTest.java | 50 +++
...uthenticationProviderForDNWithSpaceTest.java | 4 +-
.../AmbariLdapAuthenticationProviderTest.java | 4 +-
.../ambari/server/view/ViewExtractorTest.java | 262 +++++++++++
.../ambari/server/view/ViewRegistryTest.java | 105 +++--
.../src/test/python/TestAmbariServer.py | 60 ++-
.../stacks/1.3.2/HDFS/test_service_check.py | 18 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 6 +
.../2.0.6/HBASE/test_hbase_regionserver.py | 6 +
.../2.0.6/HBASE/test_hbase_service_check.py | 10 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 36 +-
.../stacks/2.0.6/HDFS/test_service_check.py | 18 +-
.../stacks/2.0.6/HIVE/test_hcat_client.py | 10 +-
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 8 +
.../stacks/2.0.6/HIVE/test_hive_server.py | 18 +
.../2.0.6/HIVE/test_hive_service_check.py | 7 +
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 10 +-
.../stacks/2.0.6/PIG/test_pig_service_check.py | 12 +-
.../stacks/2.0.6/WEBHCAT/test_webhcat_server.py | 12 +
.../stacks/2.0.6/YARN/test_historyserver.py | 12 +
.../stacks/2.0.6/YARN/test_nodemanager.py | 12 +
.../2.0.6/YARN/test_yarn_service_check.py | 9 +-
.../stacks/2.1/FALCON/test_falcon_server.py | 2 +
.../stacks/2.1/HIVE/test_hive_metastore.py | 7 +
ambari-web/app/assets/test/tests.js | 1 +
.../highAvailability/progress_controller.js | 15 +-
.../main/dashboard/config_history_controller.js | 2 +-
.../app/controllers/wizard/step7_controller.js | 8 +-
ambari-web/app/data/HDP2/secure_properties.js | 6 +-
ambari-web/app/data/secure_properties.js | 15 +
ambari-web/app/models/service_config_version.js | 5 +-
ambari-web/app/styles/application.less | 20 +-
.../common/configs/config_history_flow.hbs | 8 +-
.../templates/main/dashboard/config_history.hbs | 14 +-
ambari-web/app/utils/config.js | 14 +-
.../views/main/dashboard/config_history_view.js | 8 +-
.../progress_controller_test.js | 144 +++++++
.../assets/data/resource/slider-properties.json | 64 +++
.../ui/app/components/configSection.js | 2 +-
.../createAppWizard/step1_controller.js | 26 +-
.../createAppWizard/step3_controller.js | 8 +-
.../app/controllers/slider_apps_controller.js | 187 --------
.../ui/app/controllers/slider_controller.js | 294 +++++++++++++
.../src/main/resources/ui/app/helpers/ajax.js | 44 +-
.../src/main/resources/ui/app/initialize.js | 16 +-
.../ui/app/mappers/application_status.js | 52 ++-
.../main/resources/ui/app/models/slider_app.js | 7 +-
.../resources/ui/app/styles/application.less | 49 ++-
.../app/templates/components/configSection.hbs | 3 +-
.../ui/app/templates/createAppWizard/step3.hbs | 2 +-
.../ui/app/templates/slider_app/summary.hbs | 200 ++++-----
.../ui/app/views/createAppWizard/step3_view.js | 3 +-
.../ui/app/views/slider_app/summary_view.js | 4 +-
151 files changed, 4293 insertions(+), 1097 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aaf05135/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
