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 git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1326670 13f79535-47bb-0310-9956-ffa450edef68
author: Roman Shaposhnik <rvs@apache.org> 2012-04-16 16:10:22 +0000
committer: Roman Shaposhnik <rvs@apache.org> 2012-04-16 16:10:22 +0000
commit: 3a514f620815acf72e6b0b6d6ef351e5eb52970c (patch)
tree: 8218488ca020653732e9e7ea59ac27f368af3f9d /bigtop-test-framework/pom.xml
parent: 30ec8454c4a5175fbac3c7a6bf9fa6b2761ea3a7 (diff)
1 files changed, 2 insertions, 2 deletions
diff --git a/bigtop-test-framework/pom.xml b/bigtop-test-framework/pom.xml
index 5a92105b..659b8768 100644
--- a/bigtop-test-framework/pom.xml
+++ b/bigtop-test-framework/pom.xml
@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.apache.bigtop</groupId>
     <artifactId>bigtop</artifactId>
-    <version>0.3.0-incubating-SNAPSHOT</version>
+    <version>0.4.0-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
     
   <groupId>org.apache.bigtop.itest</groupId>
   <artifactId>itest-common</artifactId>
   <name>iTest: system and integration testing in the cloud</name>
-  <version>0.3.0-incubating-SNAPSHOT</version>
+  <version>0.4.0-incubating-SNAPSHOT</version>
 
 
   <dependencies>
author	Roman Shaposhnik <rvs@apache.org>	2012-04-16 16:10:22 +0000
committer	Roman Shaposhnik <rvs@apache.org>	2012-04-16 16:10:22 +0000
commit	3a514f620815acf72e6b0b6d6ef351e5eb52970c (patch)
tree	8218488ca020653732e9e7ea59ac27f368af3f9d /bigtop-test-framework/pom.xml
parent	30ec8454c4a5175fbac3c7a6bf9fa6b2761ea3a7 (diff)