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/24483521 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24483521 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24483521 Branch: refs/heads/branch-alerts-dev Commit: 24483521f96f395b61b786e12c444901c90073c7 Parents: ae9bf4c 7d6731b Author: Jonathan Hurley <[email protected]> Authored: Wed Sep 24 13:50:41 2014 -0700 Committer: Jonathan Hurley <[email protected]> Committed: Wed Sep 24 13:50:41 2014 -0700 ---------------------------------------------------------------------- .../TestExecuteHadoopResource.py | 14 +- .../libraries/resources/execute_hadoop.py | 2 +- .../server/configuration/Configuration.java | 14 +- .../BlueprintConfigurationProcessor.java | 28 +- .../ambari/server/orm/dao/PermissionDAO.java | 25 +- .../server/security/authorization/Users.java | 24 +- .../server/upgrade/UpgradeCatalog170.java | 33 + ambari-server/src/main/python/ambari-server.py | 14 +- .../services/HBASE/package/scripts/params.py | 3 +- .../HBASE/package/scripts/service_check.py | 4 +- .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 2 +- .../OOZIE/configuration/oozie-log4j.xml | 2 +- .../stacks/HDP/2.0.6.GlusterFS/metainfo.xml | 6 +- .../HDP/2.0.6.GlusterFS/repos/repoinfo.xml | 39 + .../HDP/2.0.6.GlusterFS/role_command_order.json | 30 +- .../GLUSTERFS/configuration/core-site.xml | 272 +- .../services/GLUSTERFS/configuration/global.xml | 35 - .../GLUSTERFS/configuration/hadoop-env.xml | 209 + .../services/GLUSTERFS/metainfo.xml | 36 +- .../services/HBASE/configuration/hbase-site.xml | 370 + .../2.0.6.GlusterFS/services/HBASE/metainfo.xml | 34 + .../2.0.6.GlusterFS/services/HDFS/metainfo.xml | 46 +- .../2.0.6.GlusterFS/services/HDFS/metrics.json | 7840 ------------------ .../services/HIVE/configuration/hive-site.xml | 502 ++ .../HIVE/etc/hive-schema-0.13.0.mysql.sql | 889 ++ .../HIVE/etc/hive-schema-0.13.0.oracle.sql | 835 ++ .../HIVE/etc/hive-schema-0.13.0.postgres.sql | 1538 ++++ .../etc/upgrade-0.12.0-to-0.13.0.oracle.sql | 165 + .../services/HIVE/etc/upgrade-0.13.0.oracle.sql | 38 + .../2.0.6.GlusterFS/services/HIVE/metainfo.xml | 100 + .../services/OOZIE/configuration/oozie-site.xml | 313 + .../2.0.6.GlusterFS/services/OOZIE/metainfo.xml | 78 + .../PIG/configuration/pig-properties.xml | 91 + .../2.0.6.GlusterFS/services/PIG/metainfo.xml | 27 + .../2.0.6.GlusterFS/services/SQOOP/metainfo.xml | 32 + .../YARN/configuration-mapred/core-site.xml.2 | 20 + .../YARN/configuration-mapred/mapred-site.xml | 88 + .../YARN/configuration-mapred/mapred-site.xml.2 | 68 + .../YARN/configuration/capacity-scheduler.xml | 124 + .../YARN/configuration/mapred-site.xml.2 | 68 + .../services/YARN/configuration/yarn-env.xml | 181 + .../services/YARN/configuration/yarn-site.xml | 413 + .../2.0.6.GlusterFS/services/YARN/metainfo.xml | 143 + .../2.0.6.GlusterFS/services/YARN/metrics.json | 2534 ++++++ .../files/validateYarnComponentStatus.py | 170 + .../services/YARN/package/scripts/__init__.py | 20 + .../scripts/application_timeline_server.py | 55 + .../YARN/package/scripts/historyserver.py | 53 + .../package/scripts/mapred_service_check.py | 73 + .../YARN/package/scripts/mapreduce2_client.py | 42 + .../YARN/package/scripts/nodemanager.py | 59 + .../services/YARN/package/scripts/params.py | 143 + .../YARN/package/scripts/resourcemanager.py | 90 + .../services/YARN/package/scripts/service.py | 62 + .../YARN/package/scripts/service_check.py | 67 + .../YARN/package/scripts/status_params.py | 35 + .../services/YARN/package/scripts/yarn.py | 163 + .../YARN/package/scripts/yarn_client.py | 42 + .../package/templates/container-executor.cfg.j2 | 22 + .../YARN/package/templates/mapreduce.conf.j2 | 17 + .../YARN/package/templates/yarn-env.sh.j2 | 128 + .../YARN/package/templates/yarn.conf.j2 | 17 + .../services/ZOOKEEPER/metainfo.xml | 28 + .../services/HBASE/package/scripts/params.py | 3 +- .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 2 +- .../NAGIOS/package/files/nagios_alerts.php | 2 +- .../OOZIE/configuration/oozie-log4j.xml | 2 +- .../package/templates/oozie-log4j.properties.j2 | 2 +- .../scripts/application_timeline_server.py | 2 +- .../services/STORM/package/scripts/params.py | 5 +- .../services/STORM/package/scripts/service.py | 10 +- .../STORM/package/scripts/service_check.py | 6 +- .../services/STORM/configuration/storm-site.xml | 12 +- .../src/main/resources/stacks/stack_advisor.py | 270 +- .../BlueprintConfigurationProcessorTest.java | 54 +- .../security/authorization/TestUsers.java | 112 +- .../server/upgrade/UpgradeCatalog170Test.java | 2 + .../src/test/python/TestAmbariServer.py | 3 +- ambari-server/src/test/python/ldap-password.dat | 1 + .../python/stacks/1.3.2/HDFS/test_namenode.py | 37 + .../stacks/1.3.2/HDFS/test_service_check.py | 75 +- .../python/stacks/1.3.2/configs/secured.json | 5 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 25 +- .../stacks/2.0.6/YARN/test_resourcemanager.py | 36 + .../python/stacks/2.0.6/configs/default.json | 1 + .../python/stacks/2.0.6/configs/secured.json | 6 +- .../stacks/2.1/STORM/test_service_check.py | 5 +- .../stacks/2.1/STORM/test_storm_drpc_server.py | 8 +- .../stacks/2.1/STORM/test_storm_nimbus.py | 8 +- .../2.1/STORM/test_storm_rest_api_service.py | 8 +- .../stacks/2.1/STORM/test_storm_supervisor.py | 16 +- .../2.1/STORM/test_storm_supervisor_prod.py | 8 +- .../stacks/2.1/STORM/test_storm_ui_server.py | 8 +- .../stacks/2.1/YARN/test_apptimelineserver.py | 14 + ambari-web/app/controllers/installer.js | 20 +- .../security/security_progress_controller.js | 27 - .../main/mirroring/jobs_controller.js | 2 +- .../controllers/main/service/info/configs.js | 21 +- .../app/controllers/wizard/step7_controller.js | 8 +- .../app/controllers/wizard/step8_controller.js | 24 +- ambari-web/app/data/HDP2/secure_properties.js | 1 + ambari-web/app/data/secure_properties.js | 1 + ambari-web/app/mappers/users_mapper.js | 12 + ambari-web/app/models/user.js | 1 + ambari-web/app/router.js | 14 +- ambari-web/app/utils/config.js | 107 +- ambari-web/app/utils/helper.js | 2 +- ambari-web/app/views/wizard/controls_view.js | 21 +- .../security_progress_controller_test.js | 71 - .../main/service/info/config_test.js | 9 +- .../test/controllers/wizard/step8_test.js | 34 +- ambari-web/test/utils/config_test.js | 38 +- .../slider-agent/0.51.0/slider-agent-0.51.0.pom | 25 + .../0.51.0/slider-agent-0.51.0.tar.gz | Bin 0 -> 472393 bytes .../slider-agent/maven-metadata-local.xml | 28 + .../slider-core/0.51.0/slider-core-0.51.0.jar | Bin 1144236 -> 1146908 bytes .../slider/slider-core/maven-metadata-local.xml | 2 +- contrib/views/slider/lib/slider-agent.tar.gz | Bin 480985 -> 0 bytes contrib/views/slider/pom.xml | 29 +- .../slider/SliderAppsViewControllerImpl.java | 27 +- .../resources/ui/app/assets/data/apps/apps.json | 475 ++ .../createAppWizard/step1_controller.js | 37 +- .../createAppWizard/step3_controller.js | 1 + .../ui/app/controllers/slider_controller.js | 36 + .../main/resources/ui/app/models/slider_app.js | 11 +- .../resources/ui/app/styles/application.less | 37 +- .../ui/app/templates/common/app_tooltip.hbs | 12 +- .../ui/app/templates/createAppWizard/step1.hbs | 41 +- .../ui/app/templates/slider_app/summary.hbs | 95 +- .../ui/app/templates/slider_title_tooltip.hbs | 3 - .../src/main/resources/ui/app/translations.js | 8 +- .../resources/ui/app/views/application_view.js | 11 +- .../resources/ui/app/views/common/chart_view.js | 6 +- .../views/slider_app/metrics/app_metric_view.js | 2 +- .../ui/app/views/slider_app/summary_view.js | 68 +- .../resources/ui/app/views/slider_apps_view.js | 1 + ...test-patch-find-new-patch-available-jiras.sh | 126 + dev-support/test-patch.sh | 1077 +++ 138 files changed, 13120 insertions(+), 8814 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24483521/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java ----------------------------------------------------------------------
