You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2014/09/07 11:45:31 UTC
[38/38] git commit: Merge branch 'trunk' into branch-alerts-dev
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/e508fe5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e508fe5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e508fe5a
Branch: refs/heads/branch-alerts-dev
Commit: e508fe5a331c2fb8a98c55ccddbcee42ec77f2b6
Parents: 91ae5f2 637d521
Author: Nate Cole <nc...@hortonworks.com>
Authored: Sun Sep 7 05:44:24 2014 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Sun Sep 7 05:44:24 2014 -0400
----------------------------------------------------------------------
.../app/scripts/controllers/NavbarCtrl.js | 41 +++-
.../admin-web/app/scripts/services/Cluster.js | 14 +-
.../resources/ui/admin-web/app/styles/main.css | 18 ++
.../ui/admin-web/app/views/leftNavbar.html | 39 +++-
ambari-agent/conf/unix/install-helper.sh | 6 +
ambari-agent/pom.xml | 2 +-
.../src/main/package/rpm/posttrans_agent.sh | 7 +
.../resources/blueprints/hdp-multinode-default | 5 +-
.../resources/blueprints/hdp-singlenode-default | 2 +-
.../resources/blueprints/lambda-architecture | 12 +-
.../resources/blueprints/multi-node-hdfs-yarn | 6 +-
.../resources/blueprints/single-node-hdfs-yarn | 2 +-
.../src/main/resources/blueprints/warmup | 8 +-
ambari-server/conf/unix/install-helper.sh | 6 +
ambari-server/pom.xml | 25 ++
.../server/api/util/StackExtensionHelper.java | 8 +-
.../server/configuration/Configuration.java | 36 +++
.../AmbariManagementControllerImpl.java | 24 +-
.../ambari/server/controller/AmbariServer.java | 10 +-
.../internal/ClientConfigResourceProvider.java | 5 +
.../internal/ViewVersionResourceProvider.java | 22 +-
.../nagios/NagiosPropertyProvider.java | 8 +-
.../ambari/server/orm/entities/ViewEntity.java | 55 ++++-
.../AmbariLdapAuthoritiesPopulator.java | 18 +-
.../AmbariLocalUserDetailsService.java | 4 +-
.../apache/ambari/server/view/ViewRegistry.java | 200 ++++++++++------
.../src/main/package/rpm/posttrans_server.sh | 7 +
.../HDP/1.3.2/configuration/cluster-env.xml | 5 +
.../1.3.2/hooks/after-INSTALL/scripts/params.py | 5 +-
.../1.3.2/hooks/before-ANY/scripts/params.py | 3 +-
.../hooks/before-INSTALL/scripts/params.py | 11 +-
.../1.3.2/hooks/before-START/scripts/params.py | 16 +-
.../scripts/shared_initialization.py | 121 +++++-----
.../services/GANGLIA/package/scripts/params.py | 2 +-
.../services/HBASE/package/scripts/params.py | 11 +-
.../services/HDFS/configuration/hadoop-env.xml | 32 +--
.../services/HDFS/package/scripts/params.py | 9 +-
.../1.3.2/services/HIVE/package/scripts/hive.py | 31 ++-
.../services/HIVE/package/scripts/params.py | 9 +-
.../MAPREDUCE/package/scripts/params.py | 9 +-
.../services/NAGIOS/package/scripts/params.py | 5 +-
.../services/OOZIE/package/scripts/params.py | 9 +-
.../services/PIG/package/scripts/params.py | 9 +-
.../services/SQOOP/package/scripts/params.py | 11 +-
.../services/WEBHCAT/package/scripts/params.py | 9 +-
.../ZOOKEEPER/package/scripts/params.py | 9 +-
.../HDP/2.0.6/configuration/cluster-env.xml | 5 +
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 8 +-
.../scripts/shared_initialization.py | 48 ++--
.../2.0.6/hooks/before-ANY/scripts/params.py | 3 +-
.../hooks/before-INSTALL/scripts/params.py | 11 +-
.../2.0.6/hooks/before-START/scripts/params.py | 12 +-
.../scripts/shared_initialization.py | 124 +++++-----
.../services/FLUME/package/scripts/params.py | 2 +-
.../services/GANGLIA/package/scripts/params.py | 2 +-
.../services/HBASE/package/scripts/params.py | 10 +-
.../services/HDFS/configuration/hadoop-env.xml | 27 ---
.../services/HDFS/package/scripts/params.py | 9 +-
.../2.0.6/services/HIVE/package/scripts/hive.py | 42 +++-
.../services/HIVE/package/scripts/params.py | 9 +-
.../services/NAGIOS/package/scripts/params.py | 62 ++---
.../services/OOZIE/package/scripts/params.py | 9 +-
.../services/PIG/package/scripts/params.py | 9 +-
.../services/SQOOP/package/scripts/params.py | 10 +-
.../services/WEBHCAT/package/scripts/params.py | 9 +-
.../YARN/configuration-mapred/mapred-site.xml | 2 +-
.../scripts/application_timeline_server.py | 4 +-
.../YARN/package/scripts/historyserver.py | 4 +-
.../services/YARN/package/scripts/params.py | 18 +-
.../services/YARN/package/scripts/service.py | 30 ++-
.../YARN/package/scripts/status_params.py | 2 +-
.../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 1 +
.../ZOOKEEPER/package/scripts/params.py | 9 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 19 +-
.../blueprints/multinode-default.json | 7 +-
.../blueprints/singlenode-default.json | 4 +-
.../services/FALCON/package/scripts/params.py | 9 +-
.../services/STORM/package/scripts/params.py | 7 +-
.../services/TEZ/package/scripts/params.py | 2 +-
.../services/YARN/package/scripts/params.py | 9 +-
.../HDP/2.1/blueprints/multinode-default.json | 7 +-
.../HDP/2.1/blueprints/singlenode-default.json | 4 +-
.../services/FALCON/package/scripts/params.py | 9 +-
.../services/STORM/package/scripts/params.py | 7 +-
.../2.1/services/TEZ/configuration/tez-site.xml | 2 +-
.../2.1/services/TEZ/package/scripts/params.py | 2 +-
.../stacks/HDP/2.2.1/services/YARN/metainfo.xml | 8 +
.../api/util/StackExtensionHelperTest.java | 27 +++
.../server/configuration/ConfigurationTest.java | 19 +-
.../AmbariManagementControllerImplTest.java | 86 +++++++
.../AmbariPrivilegeResourceProviderTest.java | 6 +-
.../ClientConfigResourceProviderTest.java | 175 +++++++++++++-
.../ViewPrivilegeResourceProviderTest.java | 6 +-
.../nagios/NagiosPropertyProviderTest.java | 2 +
.../server/orm/entities/ViewEntityTest.java | 30 ++-
...ariAuthorizationProviderDisableUserTest.java | 97 ++++++++
.../TestAmbariLdapAuthoritiesPopulator.java | 2 +
.../ambari/server/view/ViewRegistryTest.java | 52 ++++-
.../stacks/1.3.2/HIVE/test_hive_client.py | 36 +++
.../stacks/1.3.2/HIVE/test_hive_metastore.py | 36 +++
.../stacks/1.3.2/HIVE/test_hive_server.py | 36 +++
.../1.3.2/configs/default.hbasedecom.json | 24 +-
.../python/stacks/1.3.2/configs/default.json | 25 +-
.../1.3.2/configs/default.non_gmetad_host.json | 22 +-
.../stacks/1.3.2/configs/default_client.json | 24 +-
.../python/stacks/1.3.2/configs/secured.json | 24 +-
.../stacks/1.3.2/configs/secured_client.json | 25 +-
.../hooks/before-START/test_before_start.py | 3 +-
.../stacks/2.0.6/HIVE/test_hive_client.py | 52 +++++
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 52 +++++
.../stacks/2.0.6/HIVE/test_hive_server.py | 52 +++++
.../stacks/2.0.6/YARN/test_historyserver.py | 104 ++++-----
.../stacks/2.0.6/YARN/test_nodemanager.py | 103 ++++----
.../stacks/2.0.6/YARN/test_resourcemanager.py | 102 ++++----
.../stacks/2.0.6/common/test_stack_advisor.py | 54 ++++-
.../2.0.6/configs/default.hbasedecom.json | 24 +-
.../python/stacks/2.0.6/configs/default.json | 23 +-
.../2.0.6/configs/default.non_gmetad_host.json | 24 +-
.../stacks/2.0.6/configs/default_client.json | 24 +-
.../python/stacks/2.0.6/configs/ha_default.json | 24 +-
.../python/stacks/2.0.6/configs/ha_secured.json | 35 +--
.../2.0.6/configs/rebalancehdfs_default.json | 24 +-
.../python/stacks/2.0.6/configs/secured.json | 29 ++-
.../stacks/2.0.6/configs/secured_client.json | 25 +-
.../stacks/2.1/HIVE/test_hive_metastore.py | 52 +++++
.../stacks/2.1/YARN/test_apptimelineserver.py | 54 +++--
.../test/python/stacks/2.1/configs/default.json | 22 +-
.../test/python/stacks/2.1/configs/secured.json | 25 +-
.../HDP/2.0.5/services/ZOOKEEPER/metainfo.xml | 12 +
.../HDP/2.0.7/services/ZOOKEEPER/metainfo.xml | 12 +
.../org/apache/ambari/view/ViewDefinition.java | 27 +++
ambari-web/app/app.js | 13 ++
ambari-web/app/controllers/login_controller.js | 10 +-
.../app/controllers/main/admin/security.js | 43 ++--
.../security/add/addSecurity_controller.js | 7 +-
.../main/admin/security/add/step1.js | 11 +-
.../main/admin/security/add/step2.js | 1 +
.../main/admin/security/add/step3.js | 35 ++-
.../main/admin/security/add/step4.js | 9 +-
.../controllers/main/admin/security/disable.js | 4 +-
.../security/security_progress_controller.js | 20 +-
ambari-web/app/controllers/main/host/details.js | 18 +-
.../controllers/main/service/add_controller.js | 23 +-
.../controllers/main/service/info/configs.js | 5 +-
.../service/manage_config_groups_controller.js | 5 +-
.../main/service/reassign_controller.js | 6 +-
ambari-web/app/controllers/wizard.js | 66 +++---
.../app/controllers/wizard/step3_controller.js | 3 +-
.../app/controllers/wizard/step5_controller.js | 8 +-
.../app/controllers/wizard/step6_controller.js | 55 ++++-
.../app/controllers/wizard/step8_controller.js | 16 +-
ambari-web/app/data/HDP2/secure_configs.js | 32 ++-
ambari-web/app/data/HDP2/secure_mapping.js | 45 ++++
ambari-web/app/data/HDP2/secure_properties.js | 91 ++++++--
ambari-web/app/data/HDP2/site_properties.js | 41 ++--
ambari-web/app/data/secure_configs.js | 10 +-
ambari-web/app/data/secure_properties.js | 23 +-
ambari-web/app/data/service_configs.js | 1 +
ambari-web/app/data/site_properties.js | 43 ++--
ambari-web/app/messages.js | 11 +-
ambari-web/app/mixins/common/blueprint.js | 6 +-
ambari-web/app/router.js | 25 +-
ambari-web/app/routes/add_security.js | 6 +-
ambari-web/app/routes/main.js | 5 +-
ambari-web/app/styles/application.less | 71 +++---
.../common/configs/config_history_flow.hbs | 22 +-
.../templates/main/admin/security/add/step1.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 4 +
ambari-web/app/utils/blueprint.js | 8 +-
ambari-web/app/utils/config.js | 83 +++++--
.../app/views/common/configs/services_config.js | 3 +-
.../app/views/common/quick_view_link_view.js | 234 +++++++++++--------
.../app/views/main/admin/security/add/step1.js | 6 +-
ambari-web/app/views/wizard/controls_view.js | 4 +
.../main/admin/security/add/step1_test.js | 10 +-
.../main/admin/security/disable_test.js | 6 +-
.../controllers/main/admin/security_test.js | 18 +-
.../test/controllers/wizard/step6_test.js | 96 ++++++++
ambari-web/test/models/dataset_job_test.js | 2 +-
ambari-web/test/utils/blueprint_test.js | 2 +-
.../test/views/common/quick_link_view_test.js | 56 +++++
.../slider-core/0.41.0/slider-core-0.41.0.jar | Bin 0 -> 1125710 bytes
.../slider-core/0.41.0/slider-core-0.41.0.pom | 25 ++
.../slider/slider-core/maven-metadata-local.xml | 28 +++
.../slider/slider/0.30.0/slider-0.30.0.jar | Bin 1125710 -> 0 bytes
.../slider/slider/0.30.0/slider-0.30.0.pom | 25 --
.../slider/slider/maven-metadata-local.xml | 28 ---
contrib/views/slider/pom.xml | 5 +-
188 files changed, 3187 insertions(+), 1443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508fe5a/ambari-agent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e508fe5a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------