incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1459041 [1/18] - in /incubator/ambari/branches/branch-1.2: ./ ambari-agent/ ambari-agent/conf/unix/ ambari-agent/src/main/puppet/modules/hdp-ganglia/files/ ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/ ambari-agent/src/main/p...
Date Wed, 20 Mar 2013 20:44:50 GMT
Author: yusaku
Date: Wed Mar 20 20:44:43 2013
New Revision: 1459041

URL: http://svn.apache.org/r1459041
Log:
Backporting patches for 1.2.2 release. (yusaku)

Added:
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_mode.rb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_owner.rb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp/lib/puppet/parser/functions/hdp_set_from_comma_list.rb
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/InvalidQueryException.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/PredicateCompiler.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/Token.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/Expression.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpression.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/LogicalExpressionFactory.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/RelationalExpression.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AbstractOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/AndOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LogicalOperatorFactory.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/Operator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/OrOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/RelationalOperator.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/RelationalOperatorFactory.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractPropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BaseProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicate.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/CategoryPredicate.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDP/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/stacks/HDPLocal/1.2.0/services/MAPREDUCE/configuration/capacity-scheduler.xml
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.2.2.Check.sql
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.2.2.Fix.sql
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/ddl/Ambari-DDL-Postgres-UPGRADE-1.2.2.sql
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/dml/
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Postgres-UPGRADE_STACK.sql
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/agent/DummyHeartbeatConstants.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryLexerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/QueryParserTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/AndOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/EqualsOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/GreaterOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/InOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/IsEmptyOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/LessOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/NotOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/predicate/operators/OrOperatorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractPropertyProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BaseProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/CategoryIsEmptyPredicateTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/CategoryPredicateTest.java
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/installer/
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/apps/runs/
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/apps/runs/jobs/
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/installer/
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/runs/
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/runs/jobs/
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/alerts_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/utils/updater.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/sort_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/installer/
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/runs/
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/runs/jobs/
Removed:
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/files/capacity-scheduler.xml
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/files/hcatSmoke.sh
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/files/hiveSmoke.sh
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/client.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/hcat/service_check.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/hive/service_check.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/init.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/mysql-connector.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/params.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/server.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/service.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/templates/hcat-env.sh.erb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat-old/templates/hive-env.sh.erb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/imports.txt
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/rolesToClass.dict
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/serviceStates.dict
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/servicesToPidNames.dict
    incubator/ambari/branches/branch-1.2/ambari-server/pass.txt
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/MetricsMapping.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceProviderImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClearEntityManagerInterceptor.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceProviderImplTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/TestHostMappingProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/temporal_ganglia.json
    incubator/ambari/branches/branch-1.2/ambari-web/app/utils/data_table.js
    incubator/ambari/branches/branch-1.2/ambari-web/vendor/scripts/jquery.dataTables.js
Modified:
    incubator/ambari/branches/branch-1.2/CHANGES.txt
    incubator/ambari/branches/branch-1.2/KEYS
    incubator/ambari/branches/branch-1.2/NOTICE.txt
    incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini
    incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/namenode.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/service.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hcat/manifests/init.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/server.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-templeton/templates/webhcat-env.sh.erb
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
    incubator/ambari/branches/branch-1.2/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
    incubator/ambari/branches/branch-1.2/ambari-agent/src/test/python/TestHostname.py
    incubator/ambari/branches/branch-1.2/ambari-project/pom.xml
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/clusters-cluster.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/clusters.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/components-component.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/components.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/host-component.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/host-components.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/hosts-host.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/hosts.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/index.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/services-service.md
    incubator/ambari/branches/branch-1.2/ambari-server/docs/api/v1/services.md
    incubator/ambari/branches/branch-1.2/ambari-server/pom.xml
    incubator/ambari/branches/branch-1.2/ambari-server/sbin/ambari-server
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/BaseManagementHandler.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/ReadHandler.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/query/Query.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/api/services/Request.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaHostPropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/ClusterDefinition.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerNoOpProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerProviderModule.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/DefaultProviderModule.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HttpProxyPropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SchemaImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitor.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/SQLPredicateVisitor.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXHostProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/PredicateVisitor.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/PredicateVisitorAcceptor.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/PropertyProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Request.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Schema.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ComponentConfigMappingDAO.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/DaoUtils.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/KeyValueDAO.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/StageDAO.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ExecutionCommandEntity.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostRoleCommandEntity.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceInfo.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/python/ambari-server.py
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/META-INF/persistence.xml
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/ganglia_properties.json
    incubator/ambari/branches/branch-1.2/ambari-server/src/main/resources/jmx_properties.json
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/TestSuite.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/CreateHandlerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/DeleteHandlerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/QueryCreateHandlerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/ReadHandlerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/handlers/UpdateHandlerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/query/QueryImplTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/resources/ResourceInstanceImplTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/services/BaseRequestTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/services/DeleteRequestTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/services/GetRequestTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/services/PostRequestTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/api/services/PutRequestTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ResourceImplTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/PredicateVisitorTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/PropertyHelperTest.java
    incubator/ambari/branches/branch-1.2/ambari-server/src/test/resources/mapreduce_jobtracker_jmx.json
    incubator/ambari/branches/branch-1.2/ambari-web/app/app.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/application.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/global/cluster_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/global/update_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/installer.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/admin/authentication.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/admin/user.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/apps_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/host.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/host/add_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/host/details.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/add_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/configs.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/info/summary.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/main/service/item.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/slave_component_groups_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step2_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step3_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step7_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step8_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/controllers/wizard/step9_controller.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/data/config_mapping.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/data/config_properties.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/data/service_configs.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/initialize.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/alerts_mapper.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/hosts_mapper.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/runs_mapper.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/service_mapper.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/mappers/status_mapper.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/messages.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/models/alert.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/models/host.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/models/service.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/models/service_config.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/models/user.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/router.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/routes/add_host_routes.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/styles/application.less
    incubator/ambari/branches/branch-1.2/ambari-web/app/styles/apps.less
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/application.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/common/grid/header.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/common/grid/pager.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/common/metric.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/common/time_range.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/admin/advanced/uninstall.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/admin/user/edit.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/item/dag.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/apps/user_filter.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/background_operations_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/charts/heatmap.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/alert_notification_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/hbase.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/hdfs.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/dashboard/service/mapreduce.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/component_filter.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/details.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/metrics.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/host/summary.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/menu_item.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/configs.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary/ganglia.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary/oozie.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/info/summary/zookeeper.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/main/service/item.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/master_hosts.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/slave_component_hosts.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/slave_component_hosts_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/slave_hosts.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step1.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step10.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step2.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step3.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step3_host_log_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step3_host_warnings_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step4.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step5.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step6.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step7.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step8.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step8_log_popup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step9.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/templates/wizard/step9HostTasksLogPopup.hbs
    incubator/ambari/branches/branch-1.2/ambari-web/app/utils/helper.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/utils/http_client.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/utils/misc.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/utils/validator.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/chart/linear_time.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/filter_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/common/modal_popup.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps/item/dag_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/apps_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/cpu.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/load.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/memory.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/cluster_metrics/network.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/hdfs.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/dashboard/service/mapreduce.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/details.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/cpu.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/disk.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/load.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/memory.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/network.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/metrics/processes.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/menu.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/menu.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/cluster_requests.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_size.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/hlog_split_time.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_queuesize.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_regions.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hbase/regionserver_rw_requests.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/block_status.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/file_operations.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/gc.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/io.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_heap.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/jvm_threads.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/rpc.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/hdfs/space_utilization.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/gc.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jobs_status.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_heap.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/jvm_threads.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/map_slots.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/reduce_slots.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/rpc.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics/mapreduce/tasks_running_waiting.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/menu.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/controls_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step6_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step8_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step9_view.js
    incubator/ambari/branches/branch-1.2/ambari-web/config.coffee
    incubator/ambari/branches/branch-1.2/ambari-web/pom.xml
    incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh
    incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/create_nagios_addon_rpm.sh
    incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec
    incubator/ambari/branches/branch-1.2/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
    incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_hive_metastore_status.sh
    incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_name_dir_status.php
    incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_oozie_status.sh
    incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/check_webui.sh
    incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
    incubator/ambari/branches/branch-1.2/contrib/addons/src/addOns/nagios/scripts/nagios_alerts.php
    incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/pom.xml
    incubator/ambari/branches/branch-1.2/pom.xml

Modified: incubator/ambari/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/CHANGES.txt?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-1.2/CHANGES.txt Wed Mar 20 20:44:43 2013
@@ -1,6 +1,4 @@
-Ambari Change log
-
-AMBARI-1.2 branch - date: 11/01/2013
+Ambari Change Log
 
 Notes:
  - Committers should be listed using their login and non-committers
@@ -8,20 +6,566 @@ should be listed by their full name.
  - Please keep the file to a max of 80 characters wide.
  - Put latest commits first in each section.
 
-  Merging AMBARI-666 to trunk.
+Trunk (unreleased changes):
+
+ INCOMPATIBLE CHANGES 
+
+ NEW FEATURES
+
+ AMBARI-1349. Expose host-specific Nagios alerts in Ambari Web. (yusaku)
+
+ AMBARI-1294. Add isEmpty() query operator support. (jspeidel)
+
+ AMBARI-1280. Support explicit predicate grouping in API queries. (jspeidel)
+
+ AMBARI-1180. Display host check status results given by the agent as part
+ of host registration. (yusaku)
+
+ AMBARI-1252. Fetch Nagios alerts through Ambari Server and not directly
+ from Nagios Server. (srimanth via yusaku)
+
+ AMBARI-1237. Expose Nagios alerts via Rest API. (Nate Cole via jspeidel)
+
+ AMBARI-1163. During agent registration and heartbeat, send information about
+ various hadoop artifacts back to Ambari. (Nate Cole via mahadev)
+
+ AMBARI-1194. API support for cascade delete of a specified cluster
+ (Tom Beerbower via mahadev)
+
+ AMBARI-1255. Make the agent hostname determination scriptable. 
+ (mahadev)
+
+ AMBARI-1267. Store example Hive Queries somewhere in Ambari that's easily
+ accessible for demo/test purposes. (mahadev)
+
+ IMPROVEMENTS
+
+ AMBARI-1437. Update stack version. (yusaku)
+
+ AMBARI-1429. Update API docs. (jspeidel)
+
+ AMBARI-1430. Increase UI timeout for long running API operations. (yusaku)
+
+ AMBARI-1427. Add ability to increase the time range for the zoomed-in graphs
+ beyond last one hour. (yusaku) 
+
+ AMBARI-1375. Remove text from templates (main). (jaimin)
+
+ AMBARI-1374. Add filter by alerts on the Hosts page. (jaimin)
+
+ AMBARI-1373. Since there is the ability to log in to Ambari Web as 
+ different users the current user should be indicated. (jaimin)
+
+ AMBARI-1366. Nagios alert tweaks. (jaimin)
+
+ AMBARI-1365. Make Hosts table update dynamically. (jaimin)
+
+ AMBARI-1361. Install progress dialog WARN icon + color. (jaimin)
+
+ AMBARI-1347. Expose host-level alerts via nagios_alerts.php with associated
+ service component names. (yusaku)
+   
+ AMBARI-1348. Externalize strings to messages.js. (yusaku)
+
+ AMBARI-1342. Hive client is not installed on Nagios server host.
+ (jaimin)
+
+ AMBARI-1341. Add Hosts: update the API call for new operator precedence.
+ (yusaku) 
+
+ AMBARI-1340. Enhance Install/Start/Test progress display. (yusaku) 
+
+ AMBARI-1339. Validate usernames in Misc section of Customize Services step
+ in Install Wizard. (yusaku)
+
+ AMBARI-1335. Show validation error when the user specifies target hosts that
+ are already part of the cluster. (yusaku)
+
+ AMBARI-1337. Refactor Job Browser filter. (yusaku)
+
+ AMBARI-1336. Externalize text to messages.js. (yusaku)
+
+ AMBARI-1334. Show hosts that have failed install tasks as "red" to allow the
+ user to easily identify source of failure. (yusaku)
+
+ AMBARI-1333. Add username validation for Ambari local users. (yusaku) 
+
+ AMBARI-1329. Adjust job browser column sizing. (yusaku)
+ 
+ AMBARI-1327. Add Hosts. Remove existig hosts display. (Alexandr Antonenko via jspeidel)
+
+ AMBARI-1326. Remake clearFilters function in app_view (part 3). (srimanth)
+ 
+ AMBARI-1305. Make sure that Ambari Web renders all elements correctly when
+ the browser width is 1024px or narrower (refactor). (Arun Kandregula via 
+ yusaku) 
+
+ AMBARI-1312. Remake clearFilters function in app_view (part2). (Arun Kandregula
+ via yusaku) 
+ 
+ AMBARI-1309. Remove all text from Apps views, controllers, templates to 
+ messages.js. (Arun Kandregula via yusaku)
+
+ AMBARI-1308. Properly display Apps page aggregate summary and data table when
+ there are no data to be show. (Arun Kandregula via yusaku)
+
+ AMBARI-1306. Change color of rack_local_map to #66B366. (yusaku)
+
+ AMBARI-1311. Host health indicator should have a tooltip showing few details - 
+ refactoring. (Arun Kandregula via yusaku)
+
+ AMBARI-1303. Remake clearFilters function in app_view. (Arun Kandregula via
+ yusaku)
+
+ AMBARI-1302. Minor label cleanup on Jobs Charts popup. (Arun Kandregula via
+ yusaku)
+
+ AMBARI-1296. Task log popup footer should be statically placed only the
+ content should scroll vertically. (Jaimin Jetly via yusaku)
+
+ AMBARI-1295. Move cluster name display from the main nav to the top nav.
+ (Jaimin Jetly via yusaku)
+
+ AMBARI-1268. Improve DAG UI. (billie via yusaku)
+
+ AMBARI-1289. App page: remove old ode and fix test mode. (srimanth via
+ yusaku)
+
+ AMBARI-1279. Make sure that Ambari Web renders all elements correctly when
+ the browser width is 1024px or narrower. (srimanth via yusaku)
+
+ AMBARI-1274. Shrink top nav height. (srimanth)
+ 
+ AMBARI-1272. Controller javascripts need comments. (srimanth)
+ 
+ AMBARI-1271. On Confirm Hosts page, add a link to show the Host Checks popup 
+ in the success message. (yusaku via srimanth)
+
+ AMBARI-1193. If Install fails, allow user to go back to any previous step so 
+ that the user can retry install with different configuration parameters.
+ (yusaku via srimanth)
+
+ AMBARI-1265. Job Browser - Filter by Input, output and duration. (yusaku)
+
+ AMBARI-1263. Refactoring of User Management code. (yusaku)
+
+ AMBARI-1254. Modify App Browser to use server-side paging/sorting/filtering.
+ (yusaku)
+
+ AMBARI-1258. Minor refactoring of User Management code. (yusaku)
+
+ AMBARI-1253. Use ember-precompiler-brunch npm plugin. (yusaku)
+
+ AMBARI-1236. Display a progress bar during deploy prep. (yusaku)
+
+ AMBARI-1249. Update mock data to make App.testMode work. (yusaku)
+
+ AMBARI-1239. Host health status should show orange when there is at least one
+ slave component on the host with state!=STARTED. (yusaku)
+
+ AMBARI-1248. Refactoring of update, services and hosts mapper. (yusaku)
+
+ AMBARI-1247. Disable links for previous steps in left nav on Summary step.
+ (yusaku)
+
+ AMBARI-1246. Add user minor improvements. (yusaku)
+
+ AMBARI-1245. Do not let the user go back to the previous step while host
+ bootstrap is in progress. (yusaku)
+
+ AMBARI-1244. Install Options - line up the Target Hosts section with the rest
+ of the page. (yusaku)
+
+ AMBARI-1235. Host health indicator should have a tooltip showing details.
+ (yusaku)
+ 
+ AMBARI-1234. On Heatmap host hover, including list of components running.
+ (yusaku)
+
+ AMBARI-1229. Dashboard - make disk usage pie chart in HDFS summary easier
+ to understand. (yusaku)
+
+ AMBARI-1228. During Install, show "warn" on hosts that have tasks cancelled.
+ (yusaku)
+
+ AMBARI-1225. Add Hosts wizard popup is too small. (yusaku)
+
+ AMBARI-1224. Drop the "all" option from Hosts > Component Filter and
+ Jobs > Users Filter. (yusaku)
+
+ AMBARI-1223. Confirm Hosts page: It looks like hosts disappear if you are
+ on "Fail" filter and click on "Retry Failed" button. (yusaku)
+
+ AMBARI-1222. DAG, Jobs Timeline, and Tasks graphs UI cleanup. (yusaku)
+
+ AMBARI-1221. There is no default sort order on Hosts table and the order
+ changes on every page refresh - should sort by hostname. (yusaku)
+
+ AMBARI-1220. Oozie service summary update. (yusaku)
+
+ AMBARI-1218. Refactor Job Browser User filter. (yusaku)
+
+ AMBARI-1217. Tighten up spacing for the rows in the Hosts table. (yusaku)
+
+ AMBARI-1216. Add filters module. (yusaku)
+
+ AMBARI-1215. Refactor hostComponent isSlaves and isMaster and add update
+ methods for server mapper. (yusaku)
+
+ AMBARI-1214. In any starts fails, "warn" the host and the overall install.
+ (yusaku)
+
+ AMBARI-1204. Install Wizard: Re-enable configuration of user/group names for
+ master component daemons. (yusaku)
+
+ AMBARI-1197. Refactor code for graphs. (yusaku)
+
+ AMBARI-1196. Automatically update host-level popup info/logs. (yusaku)
+
+ AMBARI-1189. Add App.Job class. (yusaku)
+
+ AMBARI-1188. Refactor isClient computed property for HostComponent class.
+ (yusaku)
+
+ AMBARI-1186. Add Run class to represent a job run. (yusaku)
+
+ AMBARI-1185. Refactor the method to check if the user is an admin.
+ (yusaku)
+
+ AMBARI-1183. Directories in the service config textarea should not wrap.
+ (yusaku)
+
+ AMBARI-1182. Clean up table header UI for sorting and filter clear "x" for
+ Jobs table. (yusaku)
+
+ AMBARI-1181. Clean up table header UI for sorting and filter clear "x" for
+ Hosts table. (yusaku)
+
+ AMBARI-1198. Ambari API Performance: Parsing of Ganglia json data is slow.
+ (jspeidel via mahadev)
+
+ AMBARI-1213. Cleanup python test cases and introduce third party library for
+ mock testing python code. (mahadev)
+
+ AMBARI-1206. Expose missing metrics on host components. (tbeerbower via
+ mahadev)
+
+ AMBARI-1205. Cannot persist service configuration when service is started
+ (Siddharth Wagle via mahadev)
+
+ AMBARI-1262. Apache Ambari point to dev url, need fix in pom.xml. 
+ (mahadev)
+
+ AMBARI-1207. Remove /hdp as the httpd conf for any of the nagios urls -
+ should replace it with ambarinagios or something else.
+ (mahadev)
+
+ AMBARI-1277. Failing build due to url moved on Suse. (mahadev)
+
+ AMBARI-1288. Change "authorization" to "authentication" in props setup for
+ LDAP. (mahadev)
+
+ AMBARI-1269. Refactor ResourceProvider SPI. (tbeerbower)
+ 
+ AMBARI-1270. Add predicate objects for checking empty resource category.
+ (tbeerbower)
+
+ AMBARI-1286. Set version number property in gsInstaller cluster resource
+ provider. (tbeerbower)
+
+ AMBARI-1287. Monitor for component/service state for gsInstaller resource provider. (tbeerbower)
+
+ AMBARI-1260. Remove hard coded JMX port mappings. (Siddharth Wagle via
+ mahadev)
+
+ AMBARI-1411. Missing unit test coverage for resource providers. (tbeerbower)
+
+ AMBARI-1433. Allow capacity scheduler to be configurable via the API's.
+ (mahadev)
+
+ AMBARI-1435. L2 Cache does not work due to Eclipse Link exception.
+ (Sid Wagle via mahadev)
+
+ AMBARI-1436. Threads blocking on ClustersImpl.getHost for several minutes.
+ (Sid Wagle via mahadev)
+
+ AMBARI-1438. Add new stack definition for new stacks. (mahadev)
+
+ AMBARI-1448. Enabling stack upgrade via Ambari Server. (mahadev)
+
+ AMBARI-1439. rrd file location should be read from global config. (Siddharth
+ Wagle via mahadev).
+
+ AMBARI-1466. Optimize ganglia rrd script to be able to respond within
+ reasonable time to queries made by the UI. (mahadev)
+
+ AMBARI-1474. Upgrade stack definition for HBase for 1.2.2 since the version
+ is upgraded. (mahadev)
+
+ AMBARI-1475. Update the version of ambari artifacts to 1.2.2 snapshot.
+ (mahadev)
+
+ AMBARI-1489. Add hadoop-lzo to be one of the rpms to check for before
+ installation. (mahadev)
+
+ BUG FIXES
+
+ AMBARI-1463. State of HBase region server not updated when instance is shut down on a cluster not installed via Ambari. (tbeerbower)
+
+ AMBARI-1446. URL used by API to invoke Ganglia rrd script may exceed max length 
+              for query string for large clusters. (jspeidel)
+
+ AMBARI-1431. Hosts table no longer allows sorting. (yusaku)
+
+ AMBARI-1376. Wrong calculation of duration filter on apps page. (jaimin via
+ yusaku)
+
+ AMBARI-1165. Change the dashboard graph for HBase since its using cumulative
+ metrics. (yusaku)
+
+ AMBARI-1372. three sorting states on jobs table. (jaimin)
+ 
+ AMBARI-1350. UI screen shifts left-right depending on scrollbar. (jaimin)
+
+ AMBARI-1367. Job# for Mapreduce jobs is seen as x. (jaimin)
+
+ AMBARI-1363. Graphs jump around upon loading. (jaimin)
+
+ AMBARI-1362. Alerts for the hosts with ZooKeeper Server grows on every poll. (jaimin)
+
+ AMBARI-1360. Mouse cursor hover behavior is strange on Job Browser. (jaimin) 
+
+ AMBARI-1359. App Browser rows colours should alternate from dark grey to light 
+ grey and back. (jaimin)
+
+ AMBARI-1356. Error in filtering Configuration properties maintained at UI for 
+ WebHcat service. (jaimin)
+
+ AMBARI-1352. Host-level alert badges should only show the total number
+ of CRIT and WARN alerts for the host excluding OK. (jaimin)
+
+ AMBARI-1355. Inconsistent casing and component name for alert title. (jaimin)
+
+ AMBARI-1354. "No alerts" badge on the Host Detail page should be green, not red. (jaimin)
+
+ AMBARI-1353. "Missing translation" shown in Job Browser. (jaimin)
+
+ AMBARI-1351. Provide consistent ordering of hosts in heatmap. (jaimin)
+
+ AMBARI_1344. mapred.tasktracker.reduce.tasks.maximum in mapred-site.xml is not
+ taking effect. (yusaku)
+
+ AMBARI-1345. Alerts are not showing up at all in Service pages. (yusaku)
+
+ AMBARI-1346. The number of task trackers does not reflect the actual number
+ in MapReduce service summary after new TaskTrackers have been added until
+ page refresh. (yusaku)
+
+ AMBARI-1331. Step 8 hangs on deploy task 2 of 59, server has exception (tbeerbower)
+
+ AMBARI-1164. Disk info ganglia metrics is broken for some OS. (Dmytro Shkvyra via jspeidel)
+
+ AMBARI-1325. Left border is missing from the main nav. (srimanth)
+ 
+ AMBARI-1324. Job Browser default sort order should be Run Date DESC. (srimanth)
+ 
+ AMBARI-1323. Job Browser's column sizing needs to be improved on Firefox. (srimanth)
+
+ AMBARI-1321. Switching out of Jobs page does not launch popup anymore.
+ (srimanth via yusaku) 
+
+ AMBARI-1313. Alert time jumps between 'less than a minute ago' and 'about a
+ minute ago'. (srimanth via yusaku) 
+
+ AMBARI-1304. When switching jobs in timeline + tasks charts, blank charts show.
+ (Arun Kandregula via yusaku) 
+
+ AMBARI-1317. Deploy progress returns to deploy screen (momentarily).
+ (Arun Kandregula via yusaku) 
+
+ AMBARI-1316. Vertical scrollbar shows regardless of how tall the browser height
+ is (content height is always slightly taller than viewport). (Arun Kandregula
+ via yusaku)
+
+ AMBARI-1315. Inconsistent error/warning status in Deploy step; install
+ stalls. (Arun Kandregula via yusaku)
+
+ AMBARI-1281. Heatmap does not show up if the cluster was installed by going
+ back to a previous step from the Deploy step after an install failure.
+ (yusaku)
+
+ AMBARI-1300. Service status / host component status can get stuck in the
+ green blinking state if stop fails - no further operation can be performed.
+ (srimanth via yusaku) 
+
+ AMBARI-1297. Edit User: if "old password" is not specified and "new
+ password" is specified, password update silently fails. (Jaimin Jetly via
+ yusaku)
+
+ AMBARI-1282. Admin user can lose its own admin privilege. (Jaimin Jetly
+ via yusaku)
+
+ AMBARI-1292. Add hosts should skip host checks on existing list of cluster
+ nodes. (srimanth via yusaku)
+
+ AMBARI-1290. Left border is missing from the summary section on Jobs page.
+ (srimanth via yusaku)
+
+ AMBARI-1278. Cannot proceed from Step 3 to Step 4 in App.testMode (Next 
+ button is disabled). (srimanth)
+
+ AMBARI-1276. Job Graphs need to show x-axis ticks for elapsed time since 
+ submission. (srimanth)
+
+ AMBARI-1275. Incorrect displaying "Background operations" window after 
+ changing state of component. (srimanth)
+
+ AMBARI-1273. Edit User: No error message is shown when the user does not 
+ enter the correct "old password". (srimanth)
+
+ AMBARI-1172. Alert status change does not change time for the alerts.
+ (srimanth via yusaku) 
+
+ AMBARI-1264. Service graphs refresh with spinners. (yusaku)
+
+ AMBARI-1257. Separator missing in between Oozie and ZooKeeper. (yusaku)
+
+ AMBARI-1251. Fix routing issues on Add Host Wizard. (yusaku)
+
+ AMBARI-1230. There is a big gap in the lower part of the Jobs table header.
+ (yusaku)
+
+ AMBARI-1212. After successful install with Ambari, the user is taken to the
+ welcome page of the Install Wizard upon browser relaunch if the HTTP session
+ is expired. (yusaku)
+
+ AMBARI-1227. Host-level task popup is not showing the display name for
+ components. (yusaku)
+
+ AMBARI-1226. On Dashboard, links to host components are missing. (yusaku)
+
+ AMBARI-1219. After adding hosts, the number of live TaskTrackers is not
+ updated. (yusaku)
+
+ AMBARI-1176. In some cases, once Add Hosts wizard has run once, it requires
+ a log out before the Add Hosts wizard can be run again. (yusaku)
+
+ AMBARI-1203. mapred-site.xml default system directory is not set
+ to /mapred/system. (yusaku)
+
+ AMBARI-1200. On some clusters, Nagios alerts show up about 30 seconds after
+ page load, while on others the alerts show up immediately. (srimanth via
+ yusaku)
+
+ AMBARI-1190. Detailed log view dialogs are not center-aligned. (yusaku)
+
+ AMBARI-1187. Dashboard > MapReduce mini chart sometimes shows partial graph and hides recent data. (yusaku)
+
+ AMBARI-1184. After adding hosts, the host count shown in the Dashboard is
+ incorrect. (yusaku)
+
+ AMBARI-1178. Fix use of use ip address for JMX metrics request. (tbeerbower
+ via mahadev)
+
+ AMBARI-1191. Datatable API needs work. (Billie Rinaldi via mahadev)
+
+ AMBARI-1211. Ability to configure the same username for all the services in
+ Ambari. (mahadev)
+
+ AMBARI-1231. Replace sudo with su in the ambari setup script since ambari
+ server setup is already run as root. (mahadev)
+
+ AMBARI-1201. Improve Agent Registration and Heartbeat json. (Nate Cole via
+ mahadev)
+
+ AMBARI-1238. AmbariMetaInfoTest getServices() acceptance test failure. 
+ (Siddharth Wagle via mahadev)
+
+ AMBARI-1243. Remove unwanted import causing the builds to fail on linux.
+ (mahadev)
+
+ AMBARI-1233.  Directory permissions on httpd /var/www/cgi-bin should not be
+ touched by Ambari. (mahadev)
+
+ AMBARI-1170. For live status checks we should only look at the run
+ directories that we get from the server (only for hadoop and its eco system)
+ and not all. (mahadev)
+
+ AMBARI-1250. Upgrade the posgres connector to 9.1.
+ (mahadev)
+
+ AMBARI-1259. Fix the host roles live status not go back to INSTALLED if it
+ was in START_FAILED state. (mahadev)
+
+ AMBARI-1210. Allow capacity scheduler to be attached to host role configs for
+ CS configurability in the API's. (mahadev)
+
+ AMBARI-1256. Host registration can fail due to mount point info not fitting
+ ambari.hosts::disks_info column. (Sumit Mohanty via mahadev)
+
+ AMBARI-1266. Agent checks packages as part of host check but doesn't tell
+ which ones are needed or conflicting. (mahadev)
+
+ AMBARI-1291. Incorrect directory for MySQL component on SLES-11.1sp1.
+ (mahadev)
+
+ AMBARI-1301. Live status checks dont get triggered on server restart.
+ (mahadev)
+
+ AMBARI-1285. Some host Ganglia metrics may be missing in some cases. (tbeerbower)
+
+ AMBARI-1310. Get rid of mvn warnings. (Arun Kumar via mahadev)
+
+ AMBARI-1314. Hostname test is failing in some environments. (Nate Cole via
+ mahadev) 
+
+ AMBARI-1330. Cluster missing hosts after successful install and restart.
+ (mahadev)
+
+ AMBARI-1358. Clean up alert messages. (Yusaku Sako via mahadev)
+
+ AMBARI-1432. Ambari Agent registration hangs due to Acceptor bug in Jetty for
+ not reading through accepted connections. (mahadev)
+
+ AMBARI-1434. Change state to installed from start_failed if there is any
+ issue in starting a host component. (mahadev)
+
+ AMBARI-1476. Change webhcat-env.sh to export HADOOP_HOME
+ (mahadev)
+
+ AMBARI-1486. Fix TestHostName to take care of issues when gethostname and
+ getfqdn do not match. (mahadev)
+
+ AMBARI-1495. Out of Memory Issues on Ambari Server when server is running on
+ single core. (mahadev)
+
+ AMBARI-1487. Fix alerts at host level if MapReduce is not selected not to
+ alert for tasktrackers not running. (mahadev)
+
+ AMBARI-1488. Nagios script causes unwanted Datanode logs. (mahadev)
+
+ AMBARI-1497. Fix start up option for ambari-server where there is a missing
+ space. (mahadev)
+
+AMBARI-1.2.0 branch:
 
  INCOMPATIBLE CHANGES
  
  NEW FEATURES
 
- AMBARI-1108 - PUT call to change the state on host_components collection
+ AMBARI-1108. PUT call to change the state on host_components collection
  returns 200 (no op), even though GET with the same predicate returns a number
  of host_components. (Tom Beerbower via mahadev)
 
  AMBARI-1114. BootStrap fails but the api says thats its done and exit status
  is 0. (Nate Cole via mahadev)
 
-  AMBARI-1136 - Add gsInstaller resource provider. (Tom Beerbower via mahadev)
+ AMBARI-1136. Add gsInstaller resource provider. (Tom Beerbower via mahadev)
+
+ AMBARI-1202. Unncessary use of xml tree python library in ambari-server
+ setup. Its not being used. (Siddharth Wagle via mahadev)
+
+ IMPROVEMENTS
 
  BUG FIXES
 
@@ -31,7 +575,7 @@ should be listed by their full name.
  AMBARI-1126. Change SUSE lzo dependency to only lzo-devel. (nate cole via
  mahadev)
 
-AMBARI-666 branch (unreleased changes)
+AMBARI-666 branch:
 
   INCOMPATIBLE CHANGES
 
@@ -1016,3 +1560,4 @@ AMBARI-666 branch (unreleased changes)
   AMBARI-684. Remove non-required dependencies from pom files (hitesh via jitendra)
 
   AMBARI-680. Fix pom structure. (hitesh)
+

Modified: incubator/ambari/branches/branch-1.2/KEYS
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/KEYS?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/KEYS (original)
+++ incubator/ambari/branches/branch-1.2/KEYS Wed Mar 20 20:44:43 2013
@@ -65,11 +65,6 @@ q8NjvW09GT7Ls9llrf4IXG8kjX2PZRIfaGSa556P
 IWC8DKsT+np6ZGfoE58=
 =zb0j
 -----END PGP PUBLIC KEY BLOCK-----
-
-pub   4096R/8EE2F25C 2011-10-24
-uid                  Mahadev Konar (CODE SIGNING KEY) <mahadev@apache.org>
-sub   4096R/1F35DF4C 2011-10-24
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: SKS 1.1.0
 

Modified: incubator/ambari/branches/branch-1.2/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/NOTICE.txt?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/NOTICE.txt (original)
+++ incubator/ambari/branches/branch-1.2/NOTICE.txt Wed Mar 20 20:44:43 2013
@@ -1,9 +1,14 @@
-Apache Ambari
-Copyright 2011-2013 The Apache Software Foundation
+Apache [2012]
+Copyright [2012] The Apache Software Foundation
 
-This product includes software developed at The Apache Software
+This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).
 
+Component stdlib in puppet modules are under the following copyright: 
+Copyright (C) 2011 Puppet Labs Inc
+and some parts:
+Copyright (C) 2011 Krzysztof Wilczynski
+
 Component ambari-common/src/test/python are under the following copyright:
 
 Copyright (c) 2003-2012, Michael Foord

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/conf/unix/ambari-agent.ini Wed Mar 20 20:44:43 2013
@@ -49,4 +49,4 @@ dirs=/etc/hadoop,/etc/hadoop/conf,/etc/h
   /var/log/hadoop,/var/log/zookeeper,/var/log/hbase,/var/run/templeton,/var/log/hive,
   /var/log/nagios
 rpms=nagios,ganglia,
-  hadoop,hbase,oozie,sqoop,pig,zookeeper,hive,libconfuse,ambari-log4j
+  hadoop,hadoop-lzo,hbase,oozie,sqoop,pig,zookeeper,hive,libconfuse,ambari-log4j

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/pom.xml Wed Mar 20 20:44:43 2013
@@ -19,17 +19,18 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-agent</artifactId>
   <packaging>pom</packaging>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>Ambari Agent</name>
   <description>Ambari Agent</description>
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <final.name>${project.artifactId}-${project.version}</final.name>
     <package.release>1</package.release>
     <package.prefix>/usr</package.prefix>
@@ -60,6 +61,10 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.0</version>
+      </plugin>
+      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <tarLongFileMode>gnu</tarLongFileMode>

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh Wed Mar 20 20:44:43 2013
@@ -220,6 +220,19 @@ collection_group {
   }
 }
 
+/* This collection group will send general info about this host total memory every
+   180 secs.
+   This information doesn't change between reboots and is only collected
+   once. This information needed for heatmap showing */
+ collection_group {
+   collect_once = yes
+   time_threshold = 180
+   metric {
+    name = "mem_total"
+    title = "Memory Total"
+   }
+ }
+
 /* This collection group will send general info about this host every
    1200 secs.
    This information doesn't change between reboots and is only collected
@@ -235,10 +248,6 @@ collection_group {
     name = "cpu_speed"
     title = "CPU Speed"
   }
-  metric {
-    name = "mem_total"
-    title = "Memory Total"
-  }
   /* Should this be here? Swap can be added/removed between reboots. */
   metric {
     name = "swap_total"
@@ -426,16 +435,6 @@ collection_group {
   }
 }
 
-/* Different than 2.5.x default since the old config made no sense */
-collection_group {
-  collect_every = 1800
-  time_threshold = 3600
-  metric {
-    name = "disk_total"
-    value_threshold = 1.0
-    title = "Total Disk Space"
-  }
-}
 
 collection_group {
   collect_every = 40
@@ -450,6 +449,11 @@ collection_group {
     value_threshold = 1.0
     title = "Maximum Disk Space Used"
   }
+  metric {
+    name = "disk_total"
+    value_threshold = 1.0
+    title = "Total Disk Space"
+  }
 }
 
 include ("${GANGLIA_CONF_DIR}/${gmondClusterName}/conf.d/*.conf")

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/rrd.py Wed Mar 20 20:44:43 2013
@@ -139,6 +139,14 @@ if "pt" in queryString:
 else:
   pointInTime = False
 
+
+host_metrics = ["boottime", "bytes_in", "bytes_out", "cpu_aidle", "cpu_idle",
+                "cpu_nice", "cpu_num", "cpu_speed", "cpu_system", "cpu_user",
+                "cpu_wio", "disk_free", "disk_total", "load_fifteen", "load_five",
+                "load_one", "mem_buffers", "mem_cached", "mem_free", "mem_shared",
+                "mem_total", "part_max_used", "pkts_in", "pkts_out", "proc_run",
+                "proc_total", "swap_free", "swap_total"]
+
 for cluster in clusterParts:
   for path, dirs, files in os.walk(rrdPath + cluster):
     pathParts = path.split("/")
@@ -146,10 +154,14 @@ for cluster in clusterParts:
       for file in files:
         for metric in metricParts:
           if file.endswith(metric + ".rrd"):
-
-            printMetric(pathParts[-2], pathParts[-1], file[:-4],
-                os.path.join(path, file), cf, start, end, resolution, pointInTime)
-
+            if not (metric in host_metrics):
+              printMetric(pathParts[-2], pathParts[-1], file[:-4],
+                    os.path.join(path, file), cf, start, end, resolution, pointInTime)
+            else:
+              if (cluster == "HDPSlaves"):
+                 printMetric(pathParts[-2], pathParts[-1], file[:-4],
+                    os.path.join(path, file), cf, start, end, resolution, pointInTime)
+                
 sys.stdout.write("[AMBARI_END]\n")
 # write end time
 sys.stdout.write(str(time.mktime(time.gmtime())))

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startRrdcached.sh Wed Mar 20 20:44:43 2013
@@ -39,7 +39,7 @@ then
     su - ${GMETAD_USER} -c "${RRDCACHED_BIN} -p ${RRDCACHED_PID_FILE} \
              -m 664 -l unix:${RRDCACHED_ALL_ACCESS_UNIX_SOCKET} \
              -m 777 -P FLUSH,STATS,HELP -l unix:${RRDCACHED_LIMITED_ACCESS_UNIX_SOCKET} \
-             -b /var/lib/ganglia/rrds -B"
+             -b ${RRDCACHED_BASE_DIR} -B"
 
     # Ideally, we'd use ${RRDCACHED_BIN}'s -s ${WEBSERVER_GROUP} option for 
     # this, but it doesn't take sometimes due to a lack of permissions,

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/params.pp Wed Mar 20 20:44:43 2013
@@ -29,4 +29,5 @@ class hdp-ganglia::params() inherits hdp
   $gmond_user = $hdp::params::gmond_user
 
   $webserver_group = hdp_default("hadoop/gangliaEnv/webserver_group","apache")
+  $rrdcached_base_dir = hdp_default("rrdcached_base_dir", "/var/lib/ganglia/rrds")
 }

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp Wed Mar 20 20:44:43 2013
@@ -126,8 +126,6 @@ class hdp-ganglia::server::files(
   $ensure = present 
 )
 {
-
-
   $rrd_py_path = $hdp::params::rrd_py_path [$hdp::params::hdp_os_type]
   hdp::directory_recursive_create{$rrd_py_path:
     ensure => "directory", 
@@ -142,6 +140,16 @@ class hdp-ganglia::server::files(
     mode   => '0755',
     require => Hdp::Directory_recursive_create[$rrd_py_path]
   }
+
+  $rrd_files_dir = $hdp-ganglia::params::rrdcached_base_dir
+  $rrd_file_owner = $hdp-ganglia::params::gmetad_user
+  hdp::directory_recursive_create{ $rrd_files_dir :
+    ensure => "directory",
+    owner => $rrd_file_owner,
+    group => $rrd_file_owner,
+    mode => 755
+  }
+
 }
 
 

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaLib.sh.erb Wed Mar 20 20:44:43 2013
@@ -22,6 +22,7 @@ cd `dirname ${0}`;
 
 GANGLIA_CONF_DIR=<%=scope.function_hdp_template_var("ganglia_conf_dir")%>;
 GANGLIA_RUNTIME_DIR=<%=scope.function_hdp_template_var("ganglia_runtime_dir")%>;
+RRDCACHED_BASE_DIR=<%=scope.function_hdp_template_var("rrdcached_base_dir")%>;
 
 # This file contains all the info about each Ganglia Cluster in our Grid.
 GANGLIA_CLUSTERS_CONF_FILE=./gangliaClusters.conf;

Added: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_mode.rb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_mode.rb?rev=1459041&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_mode.rb (added)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_mode.rb Wed Mar 20 20:44:43 2013
@@ -0,0 +1,65 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#to handle differences in how args passed in
+module Puppet::Parser::Functions
+  newfunction(:hdp_hadoop_get_mode, :type => :rvalue) do |args|
+  
+    dir = args[0]
+
+    oozie_dir = lookupvar("::hdp::params::oozie_hdfs_user_dir")
+    oozie_dir_mode = lookupvar("::hdp::params::oozie_hdfs_user_mode") 
+    
+    hcat_dir = lookupvar("::hdp::params::hcat_hdfs_user_dir")
+    hcat_dir_mode = lookupvar("::hdp::params::hcat_hdfs_user_mode") 
+    
+    webhcat_dir = lookupvar("::hdp::params::webhcat_hdfs_user_dir")
+    webhcat_dir_mode = lookupvar("::hdp::params::webhcat_hdfs_user_mode") 
+    
+    hive_dir = lookupvar("::hdp::params::hive_hdfs_user_dir")
+    hive_dir_mode = lookupvar("::hdp::params::hive_hdfs_user_mode") 
+    
+    smoke_dir = lookupvar("::hdp::params::smoke_hdfs_user_dir")
+    smoke_dir_mode = lookupvar("::hdp::params::smoke_hdfs_user_mode") 
+    
+    modes = []
+    modes.push({:dir => oozie_dir, :mode => oozie_dir_mode})
+    modes.push({:dir => hcat_dir, :mode => hcat_dir_mode})
+    modes.push({:dir => webhcat_dir, :mode => webhcat_dir_mode})
+    modes.push({:dir => hive_dir, :mode => hive_dir_mode})
+    modes.push({:dir => smoke_dir, :mode => smoke_dir_mode})
+
+    modes_grouped = {}
+    modes.each do |item|
+      if modes_grouped[item[:dir]].nil?
+        modes_grouped[item[:dir]]=[]
+      end
+      modes_grouped[item[:dir]]=modes_grouped[item[:dir]] + [(item[:mode])]
+    end
+
+    modes_max = {}
+    
+    modes_grouped.each_key do |key|
+      modes_max[key] = modes_grouped[key].max
+    end
+
+    modes_max[dir]
+  end
+end

Added: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_owner.rb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_owner.rb?rev=1459041&view=auto
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_owner.rb (added)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/lib/puppet/parser/functions/hdp_hadoop_get_owner.rb Wed Mar 20 20:44:43 2013
@@ -0,0 +1,51 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+#to handle differences in how args passed in
+module Puppet::Parser::Functions
+  newfunction(:hdp_hadoop_get_owner, :type => :rvalue) do |args|
+  
+    dir = args[0]
+    
+    oozie_dir = lookupvar("::hdp::params::oozie_hdfs_user_dir")
+    oozie_user = lookupvar("::hdp::params::oozie_user") 
+
+    hcat_dir = lookupvar("::hdp::params::hcat_hdfs_user_dir")
+    hcat_user = lookupvar("::hdp::params::hcat_user") 
+
+    webhcat_dir = lookupvar("::hdp::params::webhcat_hdfs_user_dir")
+    webhcat_user = lookupvar("::hdp::params::webhcat_user") 
+
+    hive_dir = lookupvar("::hdp::params::hive_hdfs_user_dir")
+    hive_user = lookupvar("::hdp::params::hive_user") 
+
+    smoke_dir = lookupvar("::hdp::params::smoke_hdfs_user_dir")
+    smoke_user = lookupvar("::hdp::params::smokeuser") 
+
+    dirs_to_owners = {}
+    dirs_to_owners[oozie_dir] = oozie_user
+    dirs_to_owners[hcat_dir] = hcat_user
+    dirs_to_owners[webhcat_dir] = webhcat_user
+    dirs_to_owners[hive_dir] = hive_user
+    dirs_to_owners[smoke_dir] = smoke_user
+
+    dirs_to_owners[dir]
+  end
+end

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hdfs/directory.pp Wed Mar 20 20:44:43 2013
@@ -60,7 +60,7 @@ define hdp-hadoop::hdfs::directory(
   
     if ($mode != undef) {
       #TODO: see if there is a good 'unless test'
-      if ($recursive_mode == true) {
+      if ($recursive_chmod == true) {
         $chmod_cmd = "fs -chmod -R ${mode} ${name}"
       } else {
         $chmod_cmd = "fs -chmod ${mode} ${name}"

Modified: incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1459041&r1=1459040&r2=1459041&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp (original)
+++ incubator/ambari/branches/branch-1.2/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp Wed Mar 20 20:44:43 2013
@@ -101,19 +101,8 @@ debug('##Configs generation for hdp-hado
       configuration => $configuration['capacity-scheduler'],
       owner => $hdp-hadoop::params::hdfs_user,
       group => $hdp::params::user_group,
-      replace => true,
     }
-  } else { #   This file will just be a static file for now. - BUG-3195
-    file {"capacity-scheduler.xml":
-      ensure  => present,
-      source => "puppet:///modules/hdp-hadoop/capacity-scheduler.xml",
-      mode => '0744',
-      path => "${hdp-hadoop::params::conf_dir}/capacity-scheduler.xml",
-      owner => $hdp-hadoop::params::mapred_user,
-      group => $hdp::params::user_group,
-      replace => true,
-    }
-  }
+  } 
 
 
   if has_key($configuration, 'hdfs-site') {
@@ -184,7 +173,7 @@ class hdp-hadoop(
     hdp::directory_recursive_create { $logdirprefix: 
         owner => 'root'
     }
-    $piddirprefix = $hdp-hadoop::params::hadoop_piddirprefix
+    $piddirprefix = $hdp-hadoop::params::hadoop_pid_dir_prefix
     hdp::directory_recursive_create { $piddirprefix: 
         owner => 'root'
     }



Mime
View raw message