You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/04/25 01:05:51 UTC
[42/50] git commit: Merge remote-tracking branch 'public/master'
Merge remote-tracking branch 'public/master'
Conflicts:
bigtop-tests/test-execution/smokes/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/cc959c93
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/cc959c93
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/cc959c93
Branch: refs/heads/master
Commit: cc959c931e43932dcc2da77e39285ddff2d68e5b
Parents: 1080cfe 5d70fdb
Author: Konstantin Boudnik <co...@apache.org>
Authored: Tue Mar 4 15:17:17 2014 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Mar 4 15:17:17 2014 -0800
----------------------------------------------------------------------
.../itest/hadoop/hdfs/TestFileAppend.groovy | 10 +-
.../itest/hadoop/hdfs/TestHDFSQuota.groovy | 19 +--
.../hadoop/mapreduce/TestHadoopExamples.groovy | 1 +
.../bigtop/itest/hadoop/yarn/TestRmAdmin.groovy | 92 +++++++++++
.../resources/clitest_data/testHDFSConf.xml | 62 ++++----
bigtop-tests/test-artifacts/httpfs/pom.xml | 35 +++++
.../bigtop/itest/httpfs/TestHttpFs.groovy | 153 +++++++++++++++++++
.../main/resources/text-files/helloworld.txt | 1 +
.../bigtop/itest/iolongevity/TestSLive.groovy | 4 +-
bigtop-tests/test-artifacts/pom.xml | 1 +
.../test-execution/smokes/httpfs/pom.xml | 97 ++++++++++++
bigtop-tests/test-execution/smokes/pom.xml | 7 +
12 files changed, 432 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/cc959c93/bigtop-tests/test-artifacts/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/cc959c93/bigtop-tests/test-execution/smokes/pom.xml
----------------------------------------------------------------------
diff --cc bigtop-tests/test-execution/smokes/pom.xml
index 94adb61,1da31b2..8a09abb
--- a/bigtop-tests/test-execution/smokes/pom.xml
+++ b/bigtop-tests/test-execution/smokes/pom.xml
@@@ -37,7 -37,7 +37,8 @@@
<itest-conf.version>${project.version}</itest-conf.version>
<itest-common.version>${project.version}</itest-common.version>
<hadoop-smoke.version>${project.version}</hadoop-smoke.version>
+ <cnode-smoke.version>${project.version}</cnode-smoke.version>
+ <httpfs-smoke.version>${project.version}</httpfs-smoke.version>
<flume-smoke.version>${project.version}</flume-smoke.version>
<hbase-smoke.version>${project.version}</hbase-smoke.version>
<hive-smoke.version>${project.version}</hive-smoke.version>
@@@ -145,10 -151,16 +146,16 @@@
</dependency>
<dependency>
<groupId>org.apache.bigtop.itest</groupId>
- <artifactId>phoenix-smoke</artifactId>
- <version>${phoenix-smoke.version}</version>
+ <artifactId>s3hdfs-smoke</artifactId>
+ <version>${s3hdfs-smoke.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.bigtop.itest</groupId>
+ <artifactId>httpfs-smoke</artifactId>
+ <version>${httpfs-smoke.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>