You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/06 23:03:32 UTC
[10/50] [abbrv] 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/8697c91b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8697c91b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8697c91b
Branch: refs/heads/trunk
Commit: 8697c91b8309aeb9471585249d20fca6ccfee0f0
Parents: 7a0f509 641e177
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Sep 2 16:29:02 2014 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Sep 2 16:29:02 2014 -0400
----------------------------------------------------------------------
.../src/main/package/rpm/posttrans_agent.sh | 6 +
.../ambari/server/agent/ExecutionCommand.java | 2 +
.../AmbariManagementControllerImpl.java | 11 +
.../controller/StackConfigurationResponse.java | 17 +-
.../StackLevelConfigurationResponse.java | 7 +-
.../internal/BlueprintResourceProvider.java | 3 +-
.../internal/ClientConfigResourceProvider.java | 11 +-
.../internal/ClusterResourceProvider.java | 2 +-
.../StackConfigurationResourceProvider.java | 6 +
...StackLevelConfigurationResourceProvider.java | 6 +
.../server/orm/entities/BlueprintEntity.java | 4 +-
.../ambari/server/state/ConfigHelper.java | 28 +
.../ambari/server/state/PropertyInfo.java | 34 +-
.../server/upgrade/UpgradeCatalog170.java | 6 +
.../src/main/package/rpm/posttrans_server.sh | 6 +
.../src/main/resources/properties.json | 2 +
.../HDP/1.3.2/configuration/cluster-env.xml | 2 +
.../1.3.2/hooks/after-INSTALL/scripts/params.py | 1 +
.../hooks/before-INSTALL/scripts/params.py | 29 +-
.../scripts/shared_initialization.py | 111 +-
.../GANGLIA/configuration/ganglia-env.xml | 2 +
.../services/HBASE/configuration/hbase-env.xml | 1 +
.../services/HDFS/configuration/hadoop-env.xml | 12 +
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HDFS/package/scripts/params.py | 2 +-
.../services/HIVE/configuration/hive-env.xml | 3 +
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../MAPREDUCE/configuration/mapred-env.xml | 1 +
.../NAGIOS/configuration/nagios-env.xml | 4 +-
.../services/OOZIE/configuration/oozie-env.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 2 +-
.../services/SQOOP/configuration/sqoop-env.xml | 1 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 1 +
.../HDP/2.0.6/configuration/cluster-env.xml | 2 +
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 1 +
.../hooks/before-INSTALL/scripts/params.py | 35 +-
.../scripts/shared_initialization.py | 136 +--
.../services/FLUME/configuration/flume-env.xml | 1 +
.../GANGLIA/configuration/ganglia-env.xml | 2 +
.../services/HBASE/configuration/hbase-env.xml | 1 +
.../services/HDFS/configuration/core-site.xml | 11 +
.../services/HDFS/configuration/hadoop-env.xml | 12 +
.../services/HDFS/configuration/hdfs-log4j.xml | 1 +
.../services/HDFS/package/scripts/params.py | 2 +-
.../services/HIVE/configuration/hive-env.xml | 3 +
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../NAGIOS/configuration/nagios-env.xml | 4 +-
.../services/OOZIE/configuration/oozie-env.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 2 +-
.../services/SQOOP/configuration/sqoop-env.xml | 1 +
.../YARN/configuration-mapred/mapred-env.xml | 1 +
.../services/YARN/configuration/yarn-env.xml | 1 +
.../ZOOKEEPER/configuration/zookeeper-env.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../FALCON/configuration/falcon-env.xml | 1 +
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../services/STORM/configuration/storm-env.xml | 1 +
.../2.1/services/TEZ/configuration/tez-env.xml | 1 +
.../services/YARN/configuration/yarn-env.xml | 1 +
.../server/api/services/AmbariMetaInfoTest.java | 4 +-
.../api/util/StackExtensionHelperTest.java | 6 +-
.../internal/ClusterResourceProviderTest.java | 10 +-
.../orm/entities/BlueprintEntityTest.java | 24 +-
.../server/upgrade/UpgradeCatalog170Test.java | 7 +
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../app/assets/data/hosts/HDP2/hosts.json | 406 ++++++-
.../app/assets/data/hosts/quick_links.json | 62 +
.../app/assets/data/services/HDP2/services.json | 16 +
.../services/host_component_stale_configs.json | 62 +-
.../data/stacks/HDP-2.1/operating_systems.json | 157 +++
.../data/stacks/HDP-2.1/service_components.json | 1143 +++++++++++++++---
ambari-web/app/assets/data/views/instances.json | 40 +
ambari-web/app/assets/data/views/views.json | 11 +
.../app/controllers/global/update_controller.js | 3 +
.../controllers/main/service/info/configs.js | 1 +
.../app/controllers/wizard/step7_controller.js | 28 +-
ambari-web/app/data/HDP2/site_properties.js | 13 +
ambari-web/app/data/site_properties.js | 13 +
.../common/configs/config_history_flow.hbs | 4 -
.../common/configs/services_config.hbs | 37 +-
ambari-web/app/utils/ajax/ajax.js | 8 +-
ambari-web/app/utils/http_client.js | 2 +-
.../app/views/common/quick_view_link_view.js | 2 +-
.../main/service/info/config_test.js | 8 +-
.../service/reassign/step4_controller_test.js | 21 -
.../test/controllers/wizard/step8_test.js | 20 +-
ambari-web/test/models/stack_service_test.js | 12 +-
.../common/configs/config_history_flow_test.js | 2 +-
.../capacityscheduler/ConfigurationService.java | 1 +
.../ui/app/assets/fonts/fontawesome-webfont.svg | 31 +-
.../fonts/glyphicons-halflings-regular.svg | 229 ++++
.../ui/app/components/confirmDelete.js | 2 +-
.../src/main/resources/ui/app/router.js | 2 +-
.../resources/ui/app/styles/application.less | 52 +-
.../ui/app/templates/capacityEditForm.hbs | 4 +-
.../app/templates/components/totalCapacity.hbs | 22 +-
.../main/resources/ui/app/templates/queue.hbs | 60 +-
.../main/resources/ui/app/templates/queues.hbs | 12 +-
.../ui/app/templates/schedulerPanel.hbs | 14 +-
.../src/main/resources/view.xml | 6 +-
contrib/views/slider/pom.xml | 57 +-
.../slider/SliderAppsViewControllerImpl.java | 2 +-
102 files changed, 2435 insertions(+), 738 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8697c91b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8697c91b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8697c91b/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8697c91b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------