Repository: hadoop Updated Branches: refs/heads/branch-2 8dbe2a12b -> 2345627ad
HADOOP-12367. Move TestFileUtil's test resources to resources folder. (wang via yliu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2345627a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2345627a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2345627a Branch: refs/heads/branch-2 Commit: 2345627ad3f81c5854cc6021ea102d1f62633515 Parents: 8dbe2a1 Author: yliu <[email protected]> Authored: Tue Sep 1 16:25:11 2015 +0800 Committer: yliu <[email protected]> Committed: Tue Sep 1 16:25:11 2015 +0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 9 ++++++--- hadoop-common-project/hadoop-common/pom.xml | 19 +------------------ .../java/org/apache/hadoop/fs/test-untar.tar | Bin 20480 -> 0 bytes .../java/org/apache/hadoop/fs/test-untar.tgz | Bin 2024 -> 0 bytes .../src/test/resources/test-untar.tar | Bin 0 -> 20480 bytes .../src/test/resources/test-untar.tgz | Bin 0 -> 2024 bytes 6 files changed, 7 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2345627a/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index d813bed..bb269c8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -175,6 +175,12 @@ Release 2.8.0 - UNRELEASED HADOOP-12050. Enable MaxInactiveInterval for hadoop http auth token (hzlu via benoyantony) + HADOOP-12368. Mark ViewFileSystemBaseTest and ViewFsBaseTest as abstract. + (wang) + + HADOOP-12367. Move TestFileUtil's test resources to resources folder. + (wang via yliu) + BUG FIXES HADOOP-12124. Add HTrace support for FsShell (cmccabe) @@ -246,9 +252,6 @@ Release 2.8.0 - UNRELEASED HADOOP-12325. RPC Metrics : Add the ability track and log slow RPCs. (Anu Engineer via xyao) - HADOOP-12368. Mark ViewFileSystemBaseTest and ViewFsBaseTest as abstract. - (wang) - OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/2345627a/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 6deadd8..a064a57 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -448,23 +448,6 @@ </configuration> </execution> <execution> - <id>copy-test-tarballs</id> - <phase>process-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <copy toDir="${test.cache.data}"> - <fileset dir="${basedir}/src/test/java/org/apache/hadoop/fs"> - <include name="test-untar.tar"/> - <include name="test-untar.tgz"/> - </fileset> - </copy> - </target> - </configuration> - </execution> - <execution> <phase>pre-site</phase> <goals> <goal>run</goal> @@ -500,7 +483,7 @@ <exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.h</exclude> <exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc.c</exclude> <exclude>src/main/native/src/org/apache/hadoop/io/compress/lz4/lz4hc_encoder.h</exclude> - <exclude>src/test/java/org/apache/hadoop/fs/test-untar.tgz</exclude> + <exclude>src/test/resources/test-untar.tgz</exclude> <exclude>src/test/resources/test.har/_SUCCESS</exclude> <exclude>src/test/resources/test.har/_index</exclude> <exclude>src/test/resources/test.har/_masterindex</exclude> http://git-wip-us.apache.org/repos/asf/hadoop/blob/2345627a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar deleted file mode 100644 index 949e985..0000000 Binary files a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tar and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/2345627a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz deleted file mode 100644 index 9e9ef40..0000000 Binary files a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/test-untar.tgz and /dev/null differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/2345627a/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tar ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tar b/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tar new file mode 100644 index 0000000..949e985 Binary files /dev/null and b/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tar differ http://git-wip-us.apache.org/repos/asf/hadoop/blob/2345627a/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tgz ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tgz b/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tgz new file mode 100644 index 0000000..9e9ef40 Binary files /dev/null and b/hadoop-common-project/hadoop-common/src/test/resources/test-untar.tgz differ
