incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1326670 [1/47] - in /incubator/bigtop/trunk: ./ bigtop-deploy/puppet/manifests/ bigtop-deploy/puppet/modules/hadoop-hbase/manifests/ bigtop-deploy/puppet/modules/hadoop-hbase/templates/ bigtop-deploy/puppet/modules/hadoop-oozie/manifests/ ...
Date Mon, 16 Apr 2012 16:10:32 GMT
Author: rvs
Date: Mon Apr 16 16:10:22 2012
New Revision: 1326670

URL: http://svn.apache.org/viewvc?rev=1326670&view=rev
Log:
Merge branch 'hadoop-0.23' into trunk

Conflicts:
	CHANGES.txt
	bigtop-deploy/live-cd/apache-bigtop.ks
	bigtop-deploy/puppet/manifests/cluster.pp
	bigtop-deploy/puppet/manifests/site.pp
	bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop/lib/facter/hadoop_storage_dirs.rb
	bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
	bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
	bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
	bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
	bigtop-deploy/vm/boxgrinder/bigtop_hadoop.appl
	bigtop-packages/src/common/flume/do-component-build
	bigtop-packages/src/common/flume/flume-node.init
	bigtop-packages/src/common/hadoop/do-component-build
	bigtop-packages/src/common/hadoop/hdfs.conf
	bigtop-packages/src/common/hadoop/install_hadoop.sh
	bigtop-packages/src/common/hadoop/service-hadoop-httpfs
	bigtop-packages/src/common/hbase/install_hbase.sh
	bigtop-packages/src/common/hive/hadoop-hive.sh
	bigtop-packages/src/common/hive/hive.sh
	bigtop-packages/src/common/hive/hive.sh.suse
	bigtop-packages/src/common/hive/install_hive.sh
	bigtop-packages/src/common/oozie/do-component-build
	bigtop-packages/src/common/oozie/install_oozie.sh
	bigtop-packages/src/common/sqoop/do-component-build
	bigtop-packages/src/common/sqoop/install_sqoop.sh
	bigtop-packages/src/common/zookeeper/zookeeper.1
	bigtop-packages/src/deb/flume/control
	bigtop-packages/src/deb/flume/rules
	bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
	bigtop-packages/src/deb/hadoop/hadoop.install
	bigtop-packages/src/deb/hadoop/hadoop.postinst
	bigtop-packages/src/deb/hadoop/rules
	bigtop-packages/src/deb/hbase/control
	bigtop-packages/src/deb/hbase/rules
	bigtop-packages/src/deb/hive/rules
	bigtop-packages/src/deb/oozie/rules
	bigtop-packages/src/rpm/flume/SOURCES/init.d.suse
	bigtop-packages/src/rpm/flume/SPECS/flume.spec
	bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
	bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
	bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
	bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
	bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0-dev.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/mahout.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie-client.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/apt/pig.xml
	bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/flume-node.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/flume.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-conf-pseudo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-debuginfo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-libhdfs.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-master.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-regionserver.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-thrift.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/hive.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/mahout.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie-client.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/pig.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop-metastore.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/whirr.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper-server.xml
	bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume-node.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-conf-pseudo.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-libhdfs.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-doc.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-master.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-regionserver.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-thrift.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/mahout.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie-client.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/pig.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop-metastore.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/whirr.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper-server.xml
	bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper.xml
	bigtop-tests/test-execution/smokes/pom.xml
	bigtop.mk

Added:
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/jaas.conf
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/files/
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/files/java.env
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/jaas.conf
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/container-executor.cfg
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop-hdfs
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-env.sh
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/client/
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/client.pp   (contents, props changed)
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/client/install.pp
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/client/params.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/client/service.pp   (contents, props changed)
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/nfs/manifests/init.pp
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf
    incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/
    incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/do-component-build
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-jsvc/install_jsvc.sh   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/
    incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/do-component-build
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/bigtop-tomcat/install_tomcat.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/README
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/core-site.xml
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/hdfs-site.xml
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/mapred-site.xml
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-hdfs-datanode.svc
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-layout.sh
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hdfs.default
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/httpfs.default
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/init.d.tmpl   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapreduce.conf
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapreduce.default
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/yarn.conf
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/yarn.default
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hbase/HBASE-5212.patch
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh.suse   (contents, props changed)
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/mahout/MAHOUT-822.patch
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/catalina.properties   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/context.xml   (contents, props changed)
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/hive.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/patch
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/bigtop-jsvc.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/changelog   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/compat   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/control   (contents, props changed)
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/copyright   (with props)
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-jsvc/rules
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/changelog
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/compat
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/control
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/copyright
    incubator/bigtop/trunk/bigtop-packages/src/deb/bigtop-tomcat/rules
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-client.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.install
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.lintian-overrides
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.lintian-overrides
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs-fuse.manpages
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.manpages
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.postinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-hdfs.preinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.postinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.preinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-httpfs.prerm
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.postinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-mapreduce.preinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.postinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-yarn.preinst
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-dev.install
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/RPMS/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/RPMS/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SPECS/bigtop-jsvc.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SRPMS/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-jsvc/SRPMS/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/BUILD/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/RPMS/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SOURCES/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SPECS/bigtop-tomcat.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/
    incubator/bigtop/trunk/bigtop-packages/src/rpm/bigtop-tomcat/SRPMS/.gitignore
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/.gitignore
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/FSCmdExecutor.java
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestCLI.java
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testConf.xml
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/resources/testConfCluster.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/bigtop-utils.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-master.xml
      - copied, changed from r1325587, incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0-dev.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume-node.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-datanode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-namenode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs-secondarynamenode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-hdfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-httpfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-mapreduce-historyserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-mapreduce.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn-nodemanager.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn-proxyserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn-resourcemanager.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-yarn.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hive-metastore.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hive-server.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/bigtop-utils.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/flume-master.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs-datanode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs-namenode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs-secondarynamenode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-hdfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-httpfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-mapreduce-historyserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-mapreduce.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn-nodemanager.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn-proxyserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn-resourcemanager.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-yarn.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hive-metastore.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hive-server.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/bigtop-utils.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume-master.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs-datanode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs-namenode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs-secondarynamenode.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-hdfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-httpfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-mapreduce-historyserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-mapreduce.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn-nodemanager.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn-proxyserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn-resourcemanager.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-yarn.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive-metastore.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive-server.xml
Removed:
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/mapred.conf
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.lintian-overrides
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-fuse.manpages
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-native.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-native.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-pipes.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-pipes.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-sbin.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-source.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/install_init_scripts.sh
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/libhdfs0-devel.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SOURCES/install_hive.sh
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestTestCLI.groovy
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/resources/testConfCluster.xml
Modified:
    incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/zoo.cfg
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
    incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/flume/flume-node.init
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/core-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/hdfs-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hbase/install_hbase.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/hive.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/install_oozie.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie-env.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.1
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.init
    incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/pig/install_pig.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh
    incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper-server.sh.suse
    incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/zookeeper.1
    incubator/bigtop/trunk/bigtop-packages/src/deb/flume/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/docs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-conf-pseudo.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop-doc.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.dirs
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.install
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/hadoop.preinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/hive.postinst
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/pig/control
    incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/control
    incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
    incubator/bigtop/trunk/bigtop-test-framework/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/flume/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopexamples/TestHadoopExamples.groovy
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoopsmoke/TestHadoopSmoke.groovy
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hbase/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/smoke/TestLoadIncrementalHFiles.java
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestLoadAndVerify.java
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/system/TestMoveRootMetaRegions.java
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/hbase/util/HBaseTestUtil.java
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/hive/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/mahout/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/oozie/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/flume.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-conf-pseudo.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop-doc.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hadoop.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/hbase.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0-dev.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/libhdfs0.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/mahout.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie-client.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/oozie.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/apt/pig.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/urpmi/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/flume-node.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/flume.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-conf-pseudo.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-debuginfo.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-doc.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop-libhdfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hadoop.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-doc.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-master.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-regionserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase-thrift.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hbase.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/hive.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/mahout.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie-client.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/oozie.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/pig.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop-metastore.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/sqoop.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/whirr.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper-server.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/yum/zookeeper.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume-node.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/flume.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-conf-pseudo.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-doc.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop-libhdfs.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hadoop.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-doc.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-master.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-regionserver.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase-thrift.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hbase.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/hive.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/mahout.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie-client.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/oozie.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/package_data.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/pig.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop-metastore.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/sqoop.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/whirr.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper-server.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/package/src/main/resources/zypper/zookeeper.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop-smokes/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-artifacts/sqoop/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/common/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/conf/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/integration/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/integration/sqoop/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/package/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/flume/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hadoop/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hbase/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/hive/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/mahout/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/oozie/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pig/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop-smokes/pom.xml
    incubator/bigtop/trunk/bigtop-tests/test-execution/smokes/sqoop/pom.xml
    incubator/bigtop/trunk/bigtop.mk
    incubator/bigtop/trunk/package.mk
    incubator/bigtop/trunk/pom.xml

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/cluster.pp Mon Apr 16 16:10:22 2012
@@ -16,13 +16,40 @@
 class hadoop_cluster_node {
   require bigtop_util  
 
-  $hadoop_namenode_host        = $hadoop_head_node
+  $hadoop_head_node        = extlookup("hadoop_head_node") 
+  $standby_head_node = extlookup("standby_head_node", "")
+  $hadoop_gateway_node     = extlookup("hadoop_gateway_node", $hadoop_head_node)
+
+  $hadoop_ha = $standby_head_node ? {
+    ""      => disabled,
+    default => enabled,
+  }
+
+  $hadoop_namenode_host        = $hadoop_ha ? {
+    "enabled" => [ $hadoop_head_node, $standby_head_node ],
+    default   => $hadoop_head_node,
+  }
   $hadoop_namenode_port        = extlookup("hadoop_namenode_port", "17020")
   $hadoop_namenode_thrift_port = extlookup("hadoop_namenode_thrift_port", "10090")
   $hadoop_dfs_namenode_plugins = extlookup("hadoop_dfs_namenode_plugins", "")
   $hadoop_dfs_datanode_plugins = extlookup("hadoop_dfs_datanode_plugins", "")
   # $hadoop_dfs_namenode_plugins="org.apache.hadoop.thriftfs.NamenodePlugin"
   # $hadoop_dfs_datanode_plugins="org.apache.hadoop.thriftfs.DatanodePlugin"
+  $hadoop_ha_nameservice_id    = extlookup("hadoop_ha_nameservice_id", "ha-nn-uri")
+  $hadoop_namenode_uri   = $hadoop_ha ? {
+    "enabled" => "hdfs://${hadoop_ha_nameservice_id}:8020",
+    default   => "hdfs://$hadoop_namenode_host:$hadoop_namenode_port",
+  }
+
+  $hadoop_rm_host        = $hadoop_head_node
+  $hadoop_rt_port        = extlookup("hadoop_rt_port", "8025")
+  $hadoop_rm_port        = extlookup("hadoop_rm_port", "8040")
+  $hadoop_sc_port        = extlookup("hadoop_sc_port", "8030")
+  $hadoop_rt_thrift_port = extlookup("hadoop_rt_thrift_port", "9290")
+
+  $hadoop_hs_host        = $hadoop_head_node
+  $hadoop_hs_port        = extlookup("hadoop_hs_port", "10020")
+  $hadoop_hs_webapp_port = extlookup("hadoop_hs_webapp_port", "19888")
 
   $hadoop_jobtracker_host            = $hadoop_head_node
   $hadoop_jobtracker_port            = extlookup("hadoop_jobtracker_port", "8021")
@@ -32,11 +59,13 @@ class hadoop_cluster_node {
   # $hadoop_mapred_jobtracker_plugins="org.apache.hadoop.thriftfs.ThriftJobTrackerPlugin"
   # $hadoop_mapred_tasktracker_plugins="org.apache.hadoop.mapred.TaskTrackerCmonInst"
 
-  $hadoop_core_proxyusers = { oozie => { groups => 'root,hadoop,jenkins,oozie,users', hosts => "${hadoop_head_node},localhost,127.0.0.1" } }
+  $hadoop_core_proxyusers = { oozie => { groups => 'hudson,testuser,root,hadoop,jenkins,oozie,users', hosts => "${hadoop_head_node},localhost,127.0.0.1" },
+                             httpfs => { groups => 'hudson,testuser,root,hadoop,jenkins,oozie,users', hosts => "${hadoop_head_node},localhost,127.0.0.1" } }
 
   $hbase_relative_rootdir        = extlookup("hadoop_hbase_rootdir", "/hbase")
-  $hadoop_hbase_rootdir = "hdfs://$hadoop_namenode_host:$hadoop_namenode_port/$hbase_relative_rootdir"
+  $hadoop_hbase_rootdir = "$hadoop_namenode_uri$hbase_relative_rootdir"
   $hadoop_hbase_zookeeper_quorum = $hadoop_head_node
+  $hbase_heap_size               = extlookup("hbase_heap_size", "1024")
 
   $hadoop_zookeeper_ensemble = ["$hadoop_head_node:2888:3888"]
 
@@ -45,6 +74,7 @@ class hadoop_cluster_node {
   $namenode_data_dirs = extlookup("hadoop_namenode_data_dirs", append_each("/namenode", $roots))
   $hdfs_data_dirs     = extlookup("hadoop_hdfs_data_dirs",     append_each("/hdfs",     $roots))
   $mapred_data_dirs   = extlookup("hadoop_mapred_data_dirs",   append_each("/mapred",   $roots))
+  $yarn_data_dirs     = extlookup("hadoop_yarn_data_dirs",     append_each("/yarn",     $roots))
 
   $hadoop_security_authentication = extlookup("hadoop_security", "simple")
   if ($hadoop_security_authentication == "kerberos") {
@@ -56,28 +86,39 @@ class hadoop_cluster_node {
   }
 }
 
+
 class hadoop_worker_node inherits hadoop_cluster_node {
   hadoop::datanode { "datanode":
         namenode_host => $hadoop_namenode_host,
         namenode_port => $hadoop_namenode_port,
         dirs => $hdfs_data_dirs,
         auth => $hadoop_security_authentication,
+        ha   => $hadoop_ha,
   }
 
-  hadoop::tasktracker { "tasktracker":
-        namenode_host => $hadoop_namenode_host,
-        namenode_port => $hadoop_namenode_port,
-        jobtracker_host => $hadoop_jobtracker_host,
-        jobtracker_port => $hadoop_jobtracker_port,
-        dirs => $mapred_data_dirs,
+  hadoop::nodemanager { "nodemanager":
+        rm_host => $hadoop_rm_host,
+        rm_port => $hadoop_rm_port,
+        rt_port => $hadoop_rt_port,
+        dirs => $yarn_data_dirs,
         auth => $hadoop_security_authentication,
   }
 
   hadoop-hbase::server { "hbase region server":
         rootdir => $hadoop_hbase_rootdir,
+        heap_size => $hbase_heap_size,
         zookeeper_quorum => $hadoop_hbase_zookeeper_quorum,
         kerberos_realm => $kerberos_realm, 
   }
+
+  hadoop::mapred-app { "mapred-app":
+        namenode_host => $hadoop_namenode_host,
+        namenode_port => $hadoop_namenode_port,
+        jobtracker_host => $hadoop_jobtracker_host,
+        jobtracker_port => $hadoop_jobtracker_port,
+        auth => $hadoop_security_authentication,
+        dirs => $mapred_data_dirs,
+  }
 }
 
 class hadoop_head_node inherits hadoop_cluster_node {
@@ -87,32 +128,47 @@ class hadoop_head_node inherits hadoop_c
   }
 
   hadoop::namenode { "namenode":
+        host => $hadoop_namenode_host,
         port => $hadoop_namenode_port,
-        jobtracker_host => $hadoop_jobtracker_host,
-        jobtracker_port => $hadoop_jobtracker_port,
         dirs => $namenode_data_dirs,
         # thrift_port => $hadoop_namenode_thrift_port,
         auth => $hadoop_security_authentication,
+        ha   => $hadoop_ha,
   }
 
-  hadoop::secondarynamenode { "secondary namenode":
-        namenode_host => $hadoop_namenode_host,
-        namenode_port => $hadoop_namenode_port,
+  if ($hadoop_ha != "enabled") {
+    hadoop::secondarynamenode { "secondary namenode":
+          namenode_host => $hadoop_namenode_host,
+          namenode_port => $hadoop_namenode_port,
+          auth => $hadoop_security_authentication,
+    }
+  }
+
+  hadoop::resourcemanager { "resourcemanager":
+        host => $hadoop_rm_host,
+        port => $hadoop_rm_port,
+        rt_port => $hadoop_rt_port,
+        sc_port => $hadoop_sc_port,
+        # thrift_port => $hadoop_jobtracker_thrift_port,
         auth => $hadoop_security_authentication,
   }
 
-  hadoop::jobtracker { "jobtracker":
+  hadoop::historyserver { "historyserver":
+        host => $hadoop_hs_host,
+        port => $hadoop_hs_port,
+        webapp_port => $hadoop_hs_webapp_port,
+        auth => $hadoop_security_authentication,
+  }
+
+  hadoop::httpfs { "httpfs":
         namenode_host => $hadoop_namenode_host,
         namenode_port => $hadoop_namenode_port,
-        host => $hadoop_jobtracker_host,
-        port => $hadoop_jobtracker_port,
-        dirs => $mapred_data_dirs,
-        # thrift_port => $hadoop_jobtracker_thrift_port,
         auth => $hadoop_security_authentication,
   }
 
   hadoop-hbase::master { "hbase master":
         rootdir => $hadoop_hbase_rootdir,
+        heap_size => $hbase_heap_size,
         zookeeper_quorum => $hadoop_hbase_zookeeper_quorum,
         kerberos_realm => $kerberos_realm, 
   }
@@ -124,9 +180,10 @@ class hadoop_head_node inherits hadoop_c
   hadoop-zookeeper::server { "zookeeper":
         myid => "0",
         ensemble => $hadoop_zookeeper_ensemble,
+        kerberos_realm => $kerberos_realm, 
   }
 
-  hadoop::create_hdfs_dirs { [ "/mapred", "/tmp", "/system", "/user", "/hbase", "/benchmarks", "/user/jenkins", "/user/hive" ]:
+  hadoop::create_hdfs_dirs { [ "/mapred", "/tmp", "/system", "/user", "/hbase", "/benchmarks", "/user/jenkins", "/user/hive", "/user/root", "/user/history" ]:
     auth           => $hadoop_security_authentication,
     hdfs_dirs_meta => { "/tmp"          => { perm => "777", user => "hdfs"   },
                         "/mapred"       => { perm => "755", user => "mapred" },
@@ -135,19 +192,31 @@ class hadoop_head_node inherits hadoop_c
                         "/hbase"        => { perm => "755", user => "hbase"  },
                         "/benchmarks"   => { perm => "777", user => "hdfs"   },
                         "/user/jenkins" => { perm => "777", user => "jenkins"},
+                        "/user/history" => { perm => "777", user => "mapred" },
+                        "/user/root"    => { perm => "777", user => "root"   },
                         "/user/hive"    => { perm => "777", user => "hive"   } },
   }
 }
 
-class hadoop_gateway_node inherits hadoop_head_node {
-  # hadoop::client { "gateway":
-  #   namenode_host => $hadoop_namenode_host,
-  #   namenode_port => $hadoop_namenode_port,
-  #   jobtracker_host => $hadoop_jobtracker_host,
-  #   jobtracker_port => $hadoop_jobtracker_port,
-  #   # auth => $hadoop_security_authentication,
-  # }
+class standby_head_node inherits hadoop_worker_node {
+  hadoop::namenode { "namenode":
+        host => $hadoop_namenode_host,
+        port => $hadoop_namenode_port,
+        dirs => $namenode_data_dirs,
+        # thrift_port => $hadoop_namenode_thrift_port,
+        auth => $hadoop_security_authentication,
+        ha   => $hadoop_ha,
+  }
+}
 
+class hadoop_gateway_node inherits hadoop_cluster_node {
+  hadoop::client { "hadoop client":
+    namenode_host => $hadoop_namenode_host,
+    namenode_port => $hadoop_namenode_port,
+    jobtracker_host => $hadoop_jobtracker_host,
+    jobtracker_port => $hadoop_jobtracker_port,
+    # auth => $hadoop_security_authentication,
+  }
   mahout::client { "mahout client":
   }
   hadoop-pig::client { "pig client":

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/manifests/site.pp Mon Apr 16 16:10:22 2012
@@ -15,7 +15,7 @@
 
 require bigtop_util
 $puppet_confdir = get_setting("confdir")
-$default_yumrepo = "http://bigtop01.cloudera.org:8080/view/RCs/job/Bigtop-trunk-rc-zookeeper-3.4.0/label=centos5/lastSuccessfulBuild/artifact/output/"
+$default_yumrepo = "http://bigtop01.cloudera.org:8080/view/Hadoop%200.23/job/Bigtop-23-matrix/label=centos5/lastSuccessfulBuild/artifact/output/"
 $extlookup_datadir="$puppet_confdir/config"
 $extlookup_precedence = ["site", "default"]
 
@@ -32,21 +32,27 @@ package { "jdk":
    ensure => "installed",
 }
 
-# $hadoop_head_node="beefy.my.org"
-# $hadoop_security_authentication="kerberos"
-
 import "cluster.pp"
 
 node default {
-  # Fails if hadoop_head_node is unset
-  if (!$::hadoop_head_node) {
-    $hadoop_head_node = extlookup("hadoop_head_node") 
+  $hadoop_head_node = extlookup("hadoop_head_node") 
+  $standby_head_node = extlookup("standby_head_node", "")
+  $hadoop_gateway_node = extlookup("hadoop_gateway_node", $hadoop_head_node)
+
+  case $::fqdn {
+    $hadoop_head_node: {
+      include hadoop_head_node
+    }
+    $standby_head_node: {
+      include standby_head_node
+    }
+    default: {
+      include hadoop_worker_node
+    }
   }
 
-  if ($hadoop_head_node == $fqdn) {
+  if ($hadoop_gateway_node == $::fqdn) {
     include hadoop_gateway_node
-  } else {
-    include hadoop_worker_node
   }
 }
 

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/manifests/init.pp Mon Apr 16 16:10:22 2012
@@ -25,6 +25,12 @@ class hadoop-hbase {
     if ($kerberos_realm) {
       require kerberos::client
       kerberos::host_keytab { "hbase": 
+        spnego => true,
+      }
+
+      file { "/etc/hbase/conf/jaas.conf":
+        content => template("hadoop-hbase/jaas.conf"),
+        require => Package["hbase"],
       }
     }
 
@@ -42,7 +48,7 @@ class hadoop-hbase {
     include client-package
   }
 
-  define server($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
+  define server($rootdir, $zookeeper_quorum, $kerberos_realm = "", $heap_size="1024") {
     include common-server-config
 
     package { "hbase-regionserver":
@@ -59,7 +65,7 @@ class hadoop-hbase {
     Kerberos::Host_keytab <| title == "hbase" |> -> Service["hbase-regionserver"]
   }
 
-  define master($rootdir, $zookeeper_quorum, $kerberos_realm = "") {
+  define master($rootdir, $zookeeper_quorum, $kerberos_realm = "", $heap_size="1024") {
     include common-server-config
 
     package { "hbase-master":

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh Mon Apr 16 16:10:22 2012
@@ -28,7 +28,7 @@
 export HBASE_CLASSPATH=/etc/hadoop/conf
 
 # The maximum amount of heap to use, in MB. Default is 1000.
-# export HBASE_HEAPSIZE=1000
+export HBASE_HEAPSIZE=<%= heap_size %>
 
 # Extra Java runtime options.
 # Below are what we set by default.  May only work with SUN JVM.
@@ -36,6 +36,12 @@ export HBASE_CLASSPATH=/etc/hadoop/conf
 # see http://wiki.apache.org/hadoop/PerformanceTuning
 export HBASE_OPTS="$HBASE_OPTS -ea -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
 
+<% if kerberos_realm != "" -%>
+# Secure Zookeeper settings
+export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf"
+<% end -%>
+
 # Uncomment below to enable java garbage collection logging.
 # export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log" 
 

Added: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/jaas.conf
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/jaas.conf?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/jaas.conf (added)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-hbase/templates/jaas.conf Mon Apr 16 16:10:22 2012
@@ -0,0 +1,7 @@
+Client {
+     com.sun.security.auth.module.Krb5LoginModule required
+     useKeyTab=true
+     useTicketCache=false
+     keyTab="/etc/hbase.keytab"
+     principal="hbase/<%= fqdn %>@<%= kerberos_realm %>";
+};

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp Mon Apr 16 16:10:22 2012
@@ -24,6 +24,7 @@ class hadoop-oozie {
     if ($kerberos_realm) {
       require kerberos::client
       kerberos::host_keytab { "oozie":
+        spnego => true,
       }
     }
 

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml Mon Apr 16 16:10:22 2012
@@ -1,25 +1,42 @@
 <?xml version="1.0"?>
 <!--
-  Copyright (c) 2010 Yahoo! Inc. All rights reserved.
-  Licensed 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
-
+  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. See accompanying LICENSE file.
+  limitations under the License.
 -->
-
 <configuration>
 
-<!--
-    Refer to the oozie-default.xml file for the complete list of
-    Oozie configuration properties and their default values.
--->
+    <!--
+        Refer to the oozie-default.xml file for the complete list of
+        Oozie configuration properties and their default values.
+    -->
+
+    <property>
+        <name>oozie.service.ActionService.executor.ext.classes</name>
+        <value>
+            org.apache.oozie.action.email.EmailActionExecutor,
+            org.apache.oozie.action.hadoop.HiveActionExecutor,
+            org.apache.oozie.action.hadoop.ShellActionExecutor,
+            org.apache.oozie.action.hadoop.SqoopActionExecutor
+        </value>
+    </property>
+
+    <property>
+        <name>oozie.service.SchemaService.wf.ext.schemas</name>
+        <value>shell-action-0.1.xsd,email-action-0.1.xsd,hive-action-0.2.xsd,sqoop-action-0.2.xsd,ssh-action-0.1.xsd</value>
+    </property>
 
     <property>
         <name>oozie.system.id</name>
@@ -103,8 +120,8 @@
     </property>
 
     <property>
-        <name>oozie.service.StoreService.create.db.schema</name>
-        <value>true</value>
+        <name>oozie.service.JPAService.create.db.schema</name>
+        <value>false</value>
         <description>
             Creates Oozie DB.
 
@@ -114,7 +131,7 @@
     </property>
 
     <property>
-        <name>oozie.service.StoreService.jdbc.driver</name>
+        <name>oozie.service.JPAService.jdbc.driver</name>
         <value>org.apache.derby.jdbc.EmbeddedDriver</value>
         <description>
             JDBC driver class.
@@ -122,7 +139,7 @@
     </property>
 
     <property>
-        <name>oozie.service.StoreService.jdbc.url</name>
+        <name>oozie.service.JPAService.jdbc.url</name>
         <value>jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true</value>
         <description>
             JDBC URL.
@@ -130,7 +147,7 @@
     </property>
 
     <property>
-        <name>oozie.service.StoreService.jdbc.username</name>
+        <name>oozie.service.JPAService.jdbc.username</name>
         <value>sa</value>
         <description>
             DB user name.
@@ -138,21 +155,18 @@
     </property>
 
     <property>
-        <name>oozie.service.StoreService.jdbc.password</name>
+        <name>oozie.service.JPAService.jdbc.password</name>
         <value> </value>
         <description>
             DB user password.
 
             IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
                        if empty Configuration assumes it is NULL.
-
-            IMPORTANT: if the StoreServicePasswordService is active, it will reset this value with the value given in
-                       the console.
         </description>
     </property>
 
     <property>
-        <name>oozie.service.StoreService.pool.max.active.conn</name>
+        <name>oozie.service.JPAService.pool.max.active.conn</name>
         <value>10</value>
         <description>
              Max number of connections.
@@ -208,6 +222,19 @@
     </property>
 
     <property>
+        <name>oozie.service.HadoopAccessorService.hadoop.configurations</name>
+        <value>*=/etc/hadoop/conf</value>
+        <description>
+            Comma separated AUTHORITY=HADOOP_CONF_DIR, where AUTHORITY is the HOST:PORT of
+            the Hadoop service (JobTracker, HDFS). The wildcard '*' configuration is
+            used when there is no exact match for an authority. The HADOOP_CONF_DIR contains
+            the relevant Hadoop *-site.xml files. If the path is relative is looked within
+            the Oozie configuration directory; though the path can be absolute (i.e. to point
+            to Hadoop client conf/ directories in the local filesystem.
+        </description>
+    </property>
+
+    <property>
         <name>oozie.service.WorkflowAppService.system.libpath</name>
         <value>/user/${user.name}/share/lib</value>
         <description>
@@ -294,5 +321,44 @@
         </description>
     </property>
 
-</configuration>
+    <!-- Proxyuser Configuration -->
 
+    <!--
+
+    <property>
+        <name>oozie.service.ProxyUserService.proxyuser.#USER#.hosts</name>
+        <value>*</value>
+        <description>
+            List of hosts the '#USER#' user is allowed to perform 'doAs'
+            operations.
+
+            The '#USER#' must be replaced with the username o the user who is
+            allowed to perform 'doAs' operations.
+
+            The value can be the '*' wildcard or a list of hostnames.
+
+            For multiple users copy this property and replace the user name
+            in the property name.
+        </description>
+    </property>
+
+    <property>
+        <name>oozie.service.ProxyUserService.proxyuser.#USER#.groups</name>
+        <value>*</value>
+        <description>
+            List of groups the '#USER#' user is allowed to impersonate users
+            from to perform 'doAs' operations.
+
+            The '#USER#' must be replaced with the username o the user who is
+            allowed to perform 'doAs' operations.
+
+            The value can be the '*' wildcard or a list of groups.
+
+            For multiple users copy this property and replace the user name
+            in the property name.
+        </description>
+    </property>
+
+    -->
+
+</configuration>

Added: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/files/java.env
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/files/java.env?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/files/java.env (added)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/files/java.env Mon Apr 16 16:10:22 2012
@@ -0,0 +1 @@
+export SERVER_JVMFLAGS="-Djava.security.auth.login.config=/etc/zookeeper/conf/jaas.conf"

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/manifests/init.pp Mon Apr 16 16:10:22 2012
@@ -20,7 +20,9 @@ class hadoop-zookeeper {
     } 
   }
 
-  define server($myid, $ensemble = ["localhost:2888:3888"]) {
+  define server($myid, $ensemble = ["localhost:2888:3888"],
+                $kerberos_realm = "") 
+  {
     package { "zookeeper-server":
       ensure => latest,
     }
@@ -42,5 +44,26 @@ class hadoop-zookeeper {
       content => inline_template("<%= myid %>"),
       require => Package["zookeeper-server"],
     }
+
+    if ($kerberos_realm) {
+      require kerberos::client
+
+      kerberos::host_keytab { "zookeeper":
+        spnego => true,
+        notify => Service["zookeeper-server"],
+      }
+
+      file { "/etc/zookeeper/conf/java.env":
+        source  => "puppet:///modules/hadoop-zookeeper/java.env",
+        require => Package["zookeeper-server"],
+        notify  => Service["zookeeper-server"],
+      }
+
+      file { "/etc/zookeeper/conf/jaas.conf":
+        content => template("hadoop-zookeeper/jaas.conf"),
+        require => Package["zookeeper-server"],
+        notify  => Service["zookeeper-server"],
+      }
+    }
   }
 }

Added: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/jaas.conf
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/jaas.conf?rev=1326670&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/jaas.conf (added)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/jaas.conf Mon Apr 16 16:10:22 2012
@@ -0,0 +1,8 @@
+Server {
+      com.sun.security.auth.module.Krb5LoginModule required
+      useKeyTab=true
+      keyTab="/etc/zookeeper.keytab"
+      storeKey=true
+      useTicketCache=false
+      principal="zookeeper/<%= fqdn %>@<%= kerberos_realm %>";
+};

Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/zoo.cfg
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/zoo.cfg?rev=1326670&r1=1326669&r2=1326670&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/zoo.cfg (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop-zookeeper/templates/zoo.cfg Mon Apr 16 16:10:22 2012
@@ -29,3 +29,14 @@ clientPort=2181
 <% ensemble.each_with_index do |server,idx| %>
 server.<%= idx %>=<%= server %>
 <% end %>
+
+<% if kerberos_realm != "" -%>
+authProvider.1=org.apache.zookeeper.server.auth.SASLAuthenticationProvider
+jaasLoginRenew=3600000
+
+# HBase needs these configs so that different hbase daemons 
+# (master, regionservers), which run on different hosts, can 
+# read from and write to znodes that others create
+kerberos.removeHostFromPrincipal=true
+kerberos.removeRealmFromPrincipal=true
+<% end -%>



Mime
View raw message