Commit Graph

2555 Commits

Author SHA1 Message Date
Allen Wittenauer 2a0688fdb8 HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
(cherry picked from commit 8d3c0f601d)
2015-07-24 11:55:56 -07:00
Robert Kanter 731ed9cad8 HADOOP-12259. Utility to Dynamic port allocation (brahmareddy via rkanter)
(cherry picked from commit ee233ec95c)
2015-07-24 09:42:04 -07:00
Akira Ajisaka 17319c4a65 HDFS-6682. Add a metric to expose the timestamp of the oldest under-replicated block. (aajisaka)
(cherry picked from commit 02c01815ec)
2015-07-24 11:39:16 +09:00
Andrew Wang cf258b6d98 HADOOP-12189. Improve CallQueueManager#swapQueue to make queue elements drop nearly impossible. Contributed by Zhihai Xu.
(cherry picked from commit 6736a1ab70)
2015-07-23 14:42:44 -07:00
Allen Wittenauer a37285620d HADOOP-11731. Rework the changelog and releasenotes (aw)
(cherry picked from commit f383fd9b6c)

 Conflicts:
	hadoop-project/src/site/site.xml
2015-07-23 14:08:10 -07:00
Arpit Agarwal 601b503895 HADOOP-12161. Add getStoragePolicy API to the FileSystem interface. (Contributed by Brahma Reddy Battula) 2015-07-23 10:14:01 -07:00
Colin Patrick Mccabe d9876e69ee HADOOP-12184. Remove unused Linux-specific constants in NativeIO (Martin Walsh via Colin P. McCabe)
(cherry picked from commit 1b3bceb58c)
2015-07-22 11:35:14 -07:00
cnauroth bb080b32d4 HADOOP-12239. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu.
(cherry picked from commit efa97243ec)
2015-07-22 11:17:00 -07:00
Vinayakumar B 03d68b5575 HADOOP-12017. Hadoop archives command should use configurable replication factor when closing (Contributed by Bibin A Chundatt)
(cherry picked from commit 94c6a4aa85)
2015-07-22 10:27:03 +05:30
cnauroth aab1c14df6 HDFS-8773. Few FSNamesystem metrics are not documented in the Metrics page. Contributed by Rakesh R.
(cherry picked from commit a26cc66f38)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-07-21 14:13:15 -07:00
cnauroth 57d55d40dd HDFS-8721. Add a metric for number of encryption zones. Contributed by Rakesh R.
(cherry picked from commit cb03768b1b)
2015-07-21 13:56:07 -07:00
Vinayakumar B 8ef3821356 HADOOP-12214. Parse 'HadoopArchive' commandline using cli Options. (Contributed by Vinayakumar B)
(cherry picked from commit 87f29c6b8a)
2015-07-21 13:13:31 +05:30
Akira Ajisaka d591f2af5d HADOOP-12081. Fix UserGroupInformation.java to support 64-bit zLinux. (aajisaka)
(cherry picked from commit 773c670943)
2015-07-21 11:22:36 +09:00
Steve Loughran d3c23c7b18 HADOOP-11893. Mark org.apache.hadoop.security.token.Token as @InterfaceAudience.Public. (Brahma Reddy Battula via stevel) 2015-07-20 13:22:03 +01:00
Steve Loughran 577acf89f8 HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() over getMessage() in logging/span events. (Varun Saxena via stevel) 2015-07-20 13:13:09 +01:00
Steve Loughran d68b044f0f HADOOP-12088. KMSClientProvider uses equalsIgnoreCase("application/json"). (Brahma Reddy Battula via stevel) 2015-07-20 13:02:51 +01:00
Steve Loughran 208b9eed9e HADOOP-12209 Comparable type should be in FileStatus. (Yong Zhang via stevel) 2015-07-20 12:32:32 +01:00
Steve Loughran f3296a1984 HADOOP-12235 hadoop-openstack junit & mockito dependencies should be "provided". (Ted Yu via stevel) 2015-07-20 11:22:22 +01:00
Haohui Mai 391d2d88f2 HDFS-8767. RawLocalFileSystem.listStatus() returns null for UNIX pipefile. Contributed by kanaka kumar avvaru. 2015-07-16 15:22:11 -07:00
Tsuyoshi Ozawa 90c5bf0605 HADOOP-12240. Fix tests requiring native library to be skipped in non-native profile. Contributed by Masatake Iwasaki.
(cherry picked from commit 90bda9c611)
2015-07-16 16:05:11 +09:00
Tsuyoshi Ozawa f3f7872fbf HADOOP-10615. FileInputStream in JenkinsHash#main() is never closed. Contributed by Chen He.
(cherry picked from commit 111e6a3fdf)
2015-07-16 14:09:22 +09:00
Tsuyoshi Ozawa 59ba845a2f HADOOP-12153. ByteBufferReadable doesn't declare @InterfaceAudience and @InterfaceStability. Contributed by Brahma Reddy Battula.
(cherry picked from commit cec1d43db0)
2015-07-15 14:19:29 +09:00
cnauroth 5e8c01e7a2 HADOOP-12232. Upgrade Tomcat dependency to 6.0.44. Contributed by Chris Nauroth.
(cherry picked from commit 6b56f05b9ea3ee45abd5d00b14fab93a353b1332)
2015-07-14 15:22:39 -07:00
Tsuyoshi Ozawa 64059d8884 HADOOP-12191. Bzip2Factory is not thread safe. Contributed by Brahma Reddy Battula.
(cherry picked from commit 4084eaf943)
2015-07-14 19:15:36 +09:00
Chris Douglas c6b0bbabc7 HADOOP-12211. Collect disk usage on the node. Contributed by Robert Grandl
(cherry picked from commit a431ed9075)
2015-07-13 15:36:25 -07:00
Akira Ajisaka ad6787aa43 YARN-3069. Document missing properties in yarn-default.xml. Contributed by Ray Chiang.
(cherry picked from commit d6675606dc)
2015-07-13 12:57:29 +09:00
Ming Ma 5e6bbe6031 HADOOP-12107. long running apps may have a huge number of StatisticsData instances under FileSystem (Sangjin Lee via Ming Ma)
(cherry picked from commit 8e1bdc17d9)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-07-10 08:32:27 -07:00
Chris Douglas 66419d3672 HADOOP-12210. Collect network usage on the node. Contributed by Robert Grandl
(cherry picked from commit 1a0752d85a)
2015-07-09 17:48:56 -07:00
Karthik Kambatla fc989ebe16 HADOOP-12180. Move ResourceCalculatorPlugin from YARN to Common. (Chris Douglas via kasha)
(cherry picked from commit ac6048372a)
2015-07-09 09:59:02 -07:00
Akira Ajisaka ee07df688a HADOOP-12200. TestCryptoStreamsWithOpensslAesCtrCryptoCodec should be skipped in non-native profile. Contributed by Masatake Iwasaki.
(cherry picked from commit 6b7692c468)
2015-07-09 13:15:37 +09:00
Colin Patrick Mccabe 016d661caf HADOOP-12201. Add tracing to FileSystem#createFileSystem and Globber#glob (cmccabe)
(cherry picked from commit b8832fcf1e)
2015-07-08 20:12:11 -07:00
Karthik Kambatla 4227fff3c6 HADOOP-11878. FileContext#fixRelativePart should check for not null for a more informative exception. (Brahma Reddy Battula via kasha)
(cherry picked from commit 2e3d83f97b)
2015-07-08 11:35:09 -07:00
Andrew Wang cc73f23713 HADOOP-12194. Support for incremental generation in the protoc plugin.
(cherry picked from commit 625d7ed9eb)
2015-07-08 11:11:07 -07:00
Andrew Wang 9bbc3e4ad4 HADOOP-12195. Add annotation to package-info.java file to workaround MCOMPILER-205.
(cherry picked from commit 3dc92e84c2)
2015-07-07 11:14:30 -07:00
Andrew Wang 54e9b904c4 HADOOP-12193. Rename Touchz.java to Touch.java.
(cherry picked from commit aa96a8c0c5)
2015-07-07 11:14:28 -07:00
Chris Douglas 62424b5d99 HADOOP-5732. Add SFTPFileSystem. Contributed by Ramtin Boustani and Inigo Goiri
(cherry picked from commit 559425dcb9)
2015-07-07 10:09:29 -07:00
Colin Patrick Mccabe 4da63e5f5f HADOOP-11974. Fix FIONREAD #include on Solaris (Alan Burlison via Colin P. McCabe)
(cherry picked from commit 81f3644376)
2015-07-07 08:36:52 -07:00
Vinayakumar B 2b99310c32 HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync multiple times (Contributed by zhihai xu)
Moved CHANGES.txt entry to 2.7.2

(cherry picked from commit e0febce0e7)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-07-07 18:16:14 +05:30
Varun Vasudev 16ca0fcf99 YARN-2194. Fix bug causing CGroups functionality to fail on RHEL7. Contributed by Wei Yan.
(cherry-picked from commit 7e3ebc0fc59dbd1d7768b5a6c05af18b8c8fea4d)
2015-07-07 17:05:06 +05:30
Vinayakumar B c5c0577248 HADOOP-12117. Potential NPE from Configuration#loadProperty with allowNullValueProperties set. (Contributed by zhihai xu)
(cherry picked from commit 99c8c5839b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
2015-07-07 16:18:54 +05:30
Vinod Kumar Vavilapalli (I am also known as @tshooter.) a8bf34cad8 Release process for 2.7.1: Set the release date for 2.7.1.
(cherry picked from commit bf89ddb9b8)
2015-07-06 16:41:00 -07:00
Chris Douglas 360164e41e HADOOP-12185. NetworkTopology is not efficient adding/getting/removing nodes. Contributed by Inigo Goiri
(cherry picked from commit 47a69ec7a5)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
2015-07-06 15:15:45 -07:00
cnauroth d01eaef40f HADOOP-12045. Enable LocalFileSystem#setTimes to change atime. Contributed by Kazuho Fujii.
(cherry picked from commit ed1e3ce482)
2015-07-06 13:40:26 -07:00
Vinayakumar B 91d2c59968 HADOOP-12186. ActiveStandbyElector shouldn't call monitorLockNodeAsync multiple times (Contributed by zhihai xu)
(cherry picked from commit 233cab89ad)
2015-07-06 15:40:16 +05:30
Chris Douglas f2c0539d38 HADOOP-12173. NetworkTopology::add calls toString always. Contributed by Inigo Goiri
(cherry picked from commit e59f6fad6a)
2015-07-02 21:49:43 -07:00
cnauroth 0d94a293a8 HADOOP-12172. FsShell mkdir -p makes an unnecessary check for the existence of the parent. Contributed by Chris Nauroth.
(cherry picked from commit f3796224bf)
2015-07-01 19:48:17 -07:00
Colin Patrick Mccabe 490bef0856 HADOOP-12171. Shorten overly-long htrace span names for server (cmccabe)
(cherry picked from commit a78d5074fb)
2015-07-01 17:57:33 -07:00
Lei Xu fad478e7ce HADOOP-12164. Fix TestMove and TestFsShellReturnCode failed to get command name using reflection. (Lei Xu)
(cherry picked from commit 47fab573bcb7b1129648499571b518f7b9773f89)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShellReturnCode.java
2015-06-30 17:37:52 -07:00
cnauroth f7ba3c0045 HADOOP-12116. Fix unrecommended syntax usages in hadoop/hdfs/yarn script for cygwin in branch-2. Contributed by Li Lu. 2015-06-30 16:55:10 -07:00
Robert Kanter 3f79ee7494 HADOOP-12159. Move DistCpUtils#compareFs() to org.apache.hadoop.fs.FileUtil and fix for HA namespaces (rchiang via rkanter)
(cherry picked from commit aaafa0b2ee)
2015-06-30 16:50:42 -07:00
Colin Patrick Mccabe 016c794e75 HADOOP-12124. Add HTrace support for FsShell (cmccabe)
(cherry picked from commit ad60807238)
2015-06-30 16:47:14 -07:00
Colin Patrick Mccabe 7c698bc350 HADOOP-10798. globStatus() should always return a sorted list of files (cmccabe)
(cherry picked from commit 68e588cbee)
2015-06-30 16:42:36 -07:00
Gera Shegalov f9b98082b8 YARN-3768. ArrayIndexOutOfBoundsException with empty environment variables. (Zhihai Xu via gera)
(cherry picked from commit 6f2a41e37d)
2015-06-30 15:05:01 -07:00
Andrew Wang 1204140baa HADOOP-12158. Improve error message in TestCryptoStreamsWithOpensslAesCtrCryptoCodec when OpenSSL is not installed.
(cherry picked from commit b088bc6c8c36ce3fe8b69bc0280fd4ea80ca6328)
2015-06-30 15:04:23 -07:00
Steve Loughran 6719fc94e1 Revert "HADOOP-12009 Clarify FileSystem.listStatus() sorting order & fix FileSystemContractBaseTest:testListStatus. (J.Andreina via stevel)"
This reverts commit f02c06965c.
2015-06-30 11:53:03 +01:00
Vinayakumar B bc06d5b041 HADOOP-12154. FileSystem#getUsed() returns the file length only from root '/' (Contributed by J.Andreina)
(cherry picked from commit 6d99017f38)
2015-06-30 15:25:58 +05:30
cnauroth 399df10c58 HADOOP-12089. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu.
(cherry picked from commit 460e98f7b3)
2015-06-29 13:49:12 -07:00
Colin Patrick Mccabe 5ff14f2342 HADOOP-12112. Make hadoop-common-project Native code -Wall-clean (alanburlison via cmccabe) 2015-06-29 12:34:47 -07:00
Colin Patrick Mccabe df58fdaf21 HADOOP-12104. Migrate Hadoop Pipes native build to new CMake framework (Alan Burlison via Colin P. McCabe)
(cherry picked from commit 5a27c3fd76)
2015-06-29 12:31:43 -07:00
Vinayakumar B e4adb191aa HADOOP-12119. hadoop fs -expunge does not work for federated namespace (Contributed by J.Andreina)
(cherry picked from commit c815344e2e)
2015-06-29 15:59:21 +05:30
Vinod Kumar Vavilapalli 4155bb565e Adding release 2.7.2 to CHANGES.txt.
(cherry picked from commit aad6a7d5db)
2015-06-28 16:30:27 -07:00
Steve Loughran f02c06965c HADOOP-12009 Clarify FileSystem.listStatus() sorting order & fix FileSystemContractBaseTest:testListStatus. (J.Andreina via stevel) 2015-06-28 19:13:48 +01:00
Colin Patrick Mccabe 9cf5bd2fad HADOOP-12036. Consolidate all of the cmake extensions in one directory (alanburlison via cmccabe)
(cherry picked from commit aa07dea357)
2015-06-26 12:38:15 -07:00
Harsh J 55427fb66c HADOOP-8151. Error handling in snappy decompressor throws invalid exceptions. Contributed by Matt Foley. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389006 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit ac31d6a448)

Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt
2015-06-26 02:19:08 -07:00
Benoy Antony aef9ab2128 HADOOP-12049. Control http authentication cookie persistence via configuration. Contributed by Huizhi Lu.
(cherry picked from commit a815cc157c)
2015-06-24 16:41:23 -07:00
Jonathan Eagles bb6e28592e HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error occurs (Jason Lowe via jeagles)
(cherry picked from commit 2236b577a3)

Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
2015-06-24 14:54:11 -05:00
Jason Lowe 3bf44b862b MAPREDUCE-5948. org.apache.hadoop.mapred.LineRecordReader does not handle multibyte record delimiters well. Contributed by Vinayakumar B, Rushabh Shah, and Akira AJISAKA
(cherry picked from commit 077250d8d7)
2015-06-22 22:00:20 +00:00
Colin Patrick Mccabe c94579f845 HDFS-8582. Support getting a list of reconfigurable config properties and do not generate spurious reconfig warnings (Lei (Eddy) Xu via Colin P. McCabe)
(cherry picked from commit d112d18324)
2015-06-19 19:14:38 -07:00
Yongjun Zhang 430ba669cc HADOOP-12103. Small refactoring of DelegationTokenAuthenticationFilter to allow code sharing. Contributed by Yongjun Zhang.
(cherry picked from commit 49f5d20efe)
2015-06-19 14:46:31 -07:00
Colin Patrick Mccabe 2946e92f79 HADOOP-12100. ImmutableFsPermission should not override applyUmask since that method doesn't modify the FsPermission (Bibin A. Chundatt via Colin P. McCabe)
(cherry picked from commit 6e0a9f92fe)
2015-06-18 11:39:28 -07:00
Vinayakumar B 80697e4f32 HADOOP-7139. Allow appending to existing SequenceFiles (Contributed by kanaka kumar avvaru)
(cherry picked from commit 295d678be8)
2015-06-18 14:45:07 +05:30
Yongjun Zhang 8cac3888c1 HADOOP-11965. determine-flaky-tests needs a summary mode. Contributed by Yufei Gu.
(cherry picked from commit 74351af3b7)
2015-06-17 21:08:55 -07:00
cnauroth 63f3c24bb0 HADOOP-12076. Incomplete Cache Mechanism in CredentialProvider API. Contributed by Larry McCay.
(cherry picked from commit fbf55dcaf4)
2015-06-16 14:44:14 -07:00
Akira Ajisaka 4c6a1509cd HADOOP-12095. org.apache.hadoop.fs.shell.TestCount fails. Contributed by Brahma Reddy Battula.
(cherry picked from commit b578807b99)
2015-06-16 13:38:32 -07:00
Tsz-Wo Nicholas Sze 10b97f6655 HDFS-8361. Choose SSD over DISK in block placement. 2015-06-15 17:18:09 -07:00
Vinod Kumar Vavilapalli 069acdac8a HADOOP-12001. Moving CHANGES.txt up into 2.8.
(cherry picked from commit 04c9a077c8)
2015-06-15 14:30:07 -07:00
Vinod Kumar Vavilapalli 58d3a9aaf6 HADOOP-12001. Fixed LdapGroupsMapping to include configurable Posix UID and GID attributes during the search. Contributed by Patrick White.
(cherry picked from commit 722aa1db1f)
2015-06-15 14:25:40 -07:00
Akira Ajisaka e397cca456 HADOOP-11971. Move test utilities for tracing from hadoop-hdfs to hadoop-common. Contributed by Masatake Iwasaki.
(cherry picked from commit e4489d97e5)
2015-06-12 07:26:05 -07:00
Vinayakumar B 7454ed2b59 HADOOP-12074. in Shell.java#runCommand() rethrow InterruptedException as InterruptedIOException (Contributed by Lavkesh Lahngir)
(cherry picked from commit 95c73d49b1)
2015-06-11 12:00:17 +05:30
Vinayakumar B d21bc811d8 HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream with accurate .getPos() (Contributed by kanaka kumar avvaru)
(cherry picked from commit 48ca23def1)
2015-06-10 11:07:04 +05:30
Arpit Agarwal 2d67dff15f HADOOP-12078. The default retry policy does not handle RetriableException correctly. (Contributed by Arpit Agarwal) 2015-06-09 20:58:46 -07:00
cnauroth f5b0cce7fa HADOOP-12073. Azure FileSystem PageBlobInputStream does not return -1 on EOF. Contributed by Ivan Mitic.
(cherry picked from commit c45784bc90)
2015-06-08 22:42:24 -07:00
Xiaoyu Yao 116a72096d HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc. Contributed by Brahma Reddy Battula
(cherry picked from commit 927577c87c)
2015-06-08 22:03:07 -07:00
Arpit Agarwal 82e772bdbb HADOOP-12054. RPC client should not retry for InvalidToken exceptions. (Contributed by Varun Saxena) 2015-06-08 15:45:25 -07:00
cnauroth 8ee50d8ca7 HDFS-8554. TestDatanodeLayoutUpgrade fails on Windows. Contributed by Chris Nauroth.
(cherry picked from commit 0e80d51983)
2015-06-08 08:39:14 -07:00
Steve Loughran c3c2b4d318 HADOOP-12052 IPC client downgrades all exception types to IOE, breaks callers trying to use them. (Brahma Reddy Battula via stevel) 2015-06-08 13:02:26 +01:00
cnauroth 1d1841d40f HADOOP-12055. Deprecate usage of NativeIO#link. Contributed by Andrew Wang.
(cherry picked from commit e46cb80002)
2015-06-06 09:17:11 -07:00
Jason Lowe 588c22e5a0 MAPREDUCE-6354. ShuffleHandler should be able to log shuffle connections. Contributed by Chang Li
(cherry picked from commit b3ffa87003)
2015-06-05 22:39:52 +00:00
Andrew Wang 1137fd4c5b HADOOP-12056. Use DirectoryStream in DiskChecker#checkDirs to detect errors when listing a directory. Contributed by Zhihai Xu.
(cherry picked from commit bc11e158b1)
2015-06-05 13:52:43 -07:00
Andrew Wang 83a97907cc HADOOP-12059. S3Credentials should support use of CredentialProvider. Contributed by Sean Busbey.
(cherry picked from commit 2dbc40e608)
2015-06-05 13:11:12 -07:00
Gera Shegalov 2cc2488164 HADOOP-11924. Tolerate JDK-8047340-related exceptions in Shell#isSetSidAvailable preventing class init. (Tsuyoshi Ozawa via gera)
(cherry picked from commit 9f6d67844d)
2015-06-04 11:47:22 -07:00
Arpit Agarwal 75e962f367 HADOOP-11994. smart-apply-patch wrongly assumes that git is infallible. (Contributed by Kengo Seki) 2015-06-04 10:54:12 -07:00
Akira Ajisaka 1cccd1eeb3 HADOOP-12058. Fix dead links to DistCp and Hadoop Archives pages. Contributed by Kazuho Fujii.
(cherry picked from commit dbed757cba)
2015-06-05 01:46:33 +09:00
Vinayakumar B 2ce7659bf0 HADOOP-12019. update BUILDING.txt to include python for 'mvn site' in windows (Contributed by Vinayakumar B)
(cherry picked from commit 1bb79c9d01)
2015-06-04 10:44:04 +05:30
Akira Ajisaka e02df98f7d HADOOP-12018. smart-apply-patch.sh fails if the patch edits CR+LF files and is created by 'git diff --no-prefix'. Contributed by Kengo Seki.
(cherry picked from commit b5f0d294f8)
2015-06-04 11:16:24 +09:00
Akira Ajisaka 84cae6c101 HADOOP-11991. test-patch.sh isn't re-executed even if smart-apply-patch.sh is modified. Contributed by Kengo Seki.
(cherry picked from commit a6a8ee3c24)
2015-06-03 15:01:52 +09:00
Andrew Wang 52ff1610cd HADOOP-12037. Fix wrong classname in example configuration of hadoop-auth documentation. Contributed by Masatake Iwasaki.
(cherry picked from commit 990078b927)
2015-06-01 18:05:06 -07:00
Andrew Wang 600f5f5232 HADOOP-12043. Display warning if defaultFs is not set when running fs commands. Contributed by Eddy Xu.
(cherry picked from commit 374ddd9f9e)
2015-05-29 17:16:19 -07:00
Andrew Wang bdaa0fed13 HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)
(cherry picked from commit 7673d4f205)

 Conflicts:
	hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
	hadoop-mapreduce-project/pom.xml
2015-05-29 14:55:52 -07:00
Vinayakumar B 09d68d645a HADOOP-12042. Users may see TrashPolicy if hdfs dfs -rm is run (Contributed by Andreina J)
(cherry picked from commit 7366e42563)
2015-05-29 16:52:23 +05:30