Commit Graph

1174 Commits

Author SHA1 Message Date
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:25:26 +00:00
Luke Lu cc8ea9bf08 HADOOP 9871. Fix intermittent findbugs warnings in DefaultMetricsSystem. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514025 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 20:23:32 +00:00
Luke Lu 8a7cec29fe HADOOP-9446. Support Kerberos SPNEGO for IBM JDK. (Yu Gao via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513688 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 23:13:07 +00:00
Alejandro Abdelnur 5b9536d368 HADOOP-9848. Create a MiniKDC for use with security testing. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513309 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 00:27:59 +00:00
Andrew Wang d8a025bb28 HADOOP-9847. TestGlobPath symlink tests fail to cleanup properly. (cmccabe via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513255 13f79535-47bb-0310-9956-ffa450edef68
2013-08-12 20:55:03 +00:00
Chris Nauroth 086934cd59 HADOOP-9802. Merging change r1512872 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512874 13f79535-47bb-0310-9956-ffa450edef68
2013-08-11 06:05:34 +00:00
Chris Nauroth a6c58bc850 HADOOP-9857. Merging change r1512522 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512523 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 23:00:08 +00:00
Brandon Li 375378a0e5 HADOOP-8814. Merging change r1387853 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512510 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 21:57:19 +00:00
Chris Nauroth a21debedec HADOOP-9858. Remove unused private RawLocalFileSystem#execCommand method from branch-2. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512491 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 21:08:38 +00:00
Daryn Sharp 64d681bebf merge -c 1512465 FIXES: HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512466 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 19:44:50 +00:00
Colin McCabe 4382cbe53d HADOOP-9675. use svn:eol-style native for html to prevent line ending issues (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512421 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 18:00:34 +00:00
Daryn Sharp 02aa997ba2 merge -c 1512380 FIXES: HADOOP-9789. Support server advertised kerberos principals (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512381 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 16:30:10 +00:00
Kihwal Lee d90f3fbdbf svn merge -c 1512314 from trunk to branch-2 to fix HADOOP-9672.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512315 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 14:15:30 +00:00
Chris Nauroth e1ee0d049b HADOOP-9831. Merging change r1512101 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512105 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 23:55:56 +00:00
Chris Nauroth 36ac148d1e HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. Contributed by Dennis Y.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512096 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 23:20:01 +00:00
Jitendra Nath Pandey 203fbd2c86 Merge -c 1512091 from trunk for HADOOP-9820. RPCv9 wire protocol is insufficient to support multiplexing. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512094 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 23:11:10 +00:00
Arun Murthy 25038197b5 Merge -c 1512081 from trunk to branch-2 to fix YARN-1043. Push all metrics consistently. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512082 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 22:55:33 +00:00
Steve Loughran 16810177c9 merge r1512026: HADOOP-9833 move slf4j to version 1.7.5
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512048 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 21:32:01 +00:00
Colin McCabe 1af6193879 move HADOOP-9435 to branch-2.1.1-beta
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511919 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 18:26:18 +00:00
Kihwal Lee ea8aeaeab6 svn merge -c 1511823 from trunk to branch-2 to FIX HADOOP-9850. RPC kerberos errors don't trigger relogin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511824 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 15:05:20 +00:00
Brandon Li 50950fd3ff HDFS-4763. Merging change r1511519 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511522 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 22:30:51 +00:00
Jing Zhao 8dfe7e0aa4 HDFS-4926. Merge change r1511477 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511478 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 20:40:36 +00:00
Chris Nauroth 0664a552d2 HADOOP-9527. Merging change r1511118 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511120 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 20:43:13 +00:00
Jing Zhao ce28aebfba HADOOP-9821. Merge change r1511058 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511063 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 18:25:39 +00:00
Andrew Wang afa778b8f9 HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work with symlinks. (Colin Patrick McCabe via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510816 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 23:42:39 +00:00
Daryn Sharp 9186e30af9 HADOOP-9832. [RPC v9] Add RPC header to client ping (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510805 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 23:21:53 +00:00
Chris Nauroth 9541a31f1d HDFS-4905. Merging change r1510773 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510780 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 22:11:30 +00:00
Daryn Sharp 9d28a52b30 merge -c 1510772 FIXES: HADOOP-9816. RPC Sasl QOP is broken (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510774 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 22:05:25 +00:00
Luke Lu 3cadf85d86 HADOOP-9319. Update bundled LZ4 source to r99. (Binglin Chang via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510735 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 21:12:23 +00:00
Brandon Li fd3fa129b5 move HADOOP-9806 to the right section in hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510669 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 19:18:13 +00:00
Colin McCabe df120f00c1 HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509876 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 21:47:43 +00:00
Brandon Li bc6a1d96eb HADOOP-9806. Merging r1509347 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509427 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 20:46:18 +00:00
Chris Nauroth 054dd3a029 HADOOP-9801. Merging change r1509405 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509408 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 20:09:10 +00:00
Brandon Li d3946f980a HDFS-4962. Merging change r1501851 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509386 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 19:05:28 +00:00
Tsz-wo Sze e31fcf6ec5 svn merge -c 1509070 from trunk for HADOOP-9803. Add a generic type parameter to RetryInvocationHandler.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 02:23:41 +00:00
Colin McCabe 7cd77b1abf HADOOP-9758. Provide configuration option for FS/FC symlink resolution. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509065 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 01:08:32 +00:00
Sanford Ryza 48c7f0a0d4 HADOOP-9787. ShutdownHelper util to shutdown threads and threadpools. (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509053 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 23:57:02 +00:00
Chris Nauroth cdd550375a HADOOP-9768. Merging change r1508527 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508531 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 17:16:28 +00:00
Chris Nauroth 352c55dca5 HADOOP-9768. Merging change r1508305 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508530 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 17:15:55 +00:00
Jason Darrell Lowe c655774357 Revert HADOOP-9652 from branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508471 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 14:42:59 +00:00
Arun Murthy 65735031d7 Updating releasenotes for hadoop-2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508426 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:55:51 +00:00
Arun Murthy e65416a459 Updating release date for hadoop-2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508408 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:25:13 +00:00
Arun Murthy 22c3004c40 Moved HADOOP-9509 & HADOOP-9515 to appropriate release of 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508403 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:22:36 +00:00
Suresh Srinivas 9cec392a45 HDFS-5025. Merge 1508332 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508335 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 07:56:23 +00:00
Suresh Srinivas 1b8522d03d HADOOP-9792. Merge 1508312 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508313 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 06:24:02 +00:00
Jing Zhao b3f765ad3d HADOOP-9786. Merge change r1508304 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508307 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 05:47:54 +00:00
Daryn Sharp c51c782b35 merge -c 1508086 FIXES: HADOOP-9698. [RPC v9] Client must honor server's SASL negotiate response (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508088 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 14:50:44 +00:00
Tsz-wo Sze 3c08e71316 svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507586 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 07:01:51 +00:00
Colin McCabe c0cb57e307 add HADOOP-9652 to CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507511 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 23:11:33 +00:00
Colin McCabe e2ed06954e HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner and mode. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507509 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 23:09:55 +00:00
Chris Nauroth 494dfb7163 HADOOP-9507. Merging change r1507429 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507431 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 20:52:36 +00:00
Suresh Srinivas ebaec05891 HADOOP-9770. Merge 1507414 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507416 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 20:02:35 +00:00
Suresh Srinivas e3d5a147d0 HDFS-5016. Merge 1507189 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507191 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 04:47:25 +00:00
Suresh Srinivas 3bd39b2ea1 HDFS-4979. Merge 1507170 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507173 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 01:19:25 +00:00
Tsz-wo Sze ca8723f488 svn merge -c 1507165 from trunk for HADOOP-9773. TestLightWeightCache should not set size limit to zero when esting it.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507167 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 01:00:54 +00:00
Alejandro Abdelnur 6e23cbe38f HADOOP-9701. mvn site ambiguous links in hadoop-common. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506765 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 22:43:01 +00:00
Jing Zhao e074e65f91 HADOOP-9762. Merge change r1506426 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506428 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 07:51:32 +00:00
Jing Zhao b98e6a2245 HADOOP-9763. Merge change r1506405 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506408 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 06:38:20 +00:00
Chris Nauroth 366eda548b HADOOP-9759. Merging change r1506325 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506329 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 22:13:04 +00:00
Colin McCabe 5ff0774e8a HDFS-4817. Make HDFS advisory caching configurable on a per-file basis. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506188 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 17:54:44 +00:00
Suresh Srinivas f284b538fd HDFS-4974. Merge 1505911 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505912 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 06:44:47 +00:00
Suresh Srinivas 5c05d70c13 HADOOP-9760. Merge 1505875 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505876 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 01:47:09 +00:00
Colin McCabe ab17599b03 HADOOP-9435. Support building the JNI code against the IBM JVM. (Tian Hong Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505748 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 17:58:11 +00:00
Tsz-wo Sze dbf8d190d2 svn merge -c 1505610 from trunk for HADOOP-9754. Remove unnecessary "throws IOException/InterruptedException", and fix generic and other javac warnings.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505613 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 07:41:33 +00:00
Suresh Srinivas 0d85f58035 HADOOP-9751. Merge r1505036 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505059 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 22:40:26 +00:00
Suresh Srinivas d7e32b0451 HADOOP-9717. Merge r1504725 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505053 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 22:20:09 +00:00
Suresh Srinivas 73832071ea HADOOP-9716. Merge r1504362 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505052 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 22:15:19 +00:00
Suresh Srinivas 7ac2c423cc HADOOP-9691. Merge r1501615 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505042 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:59:14 +00:00
Suresh Srinivas 6e967c10f3 HADOOP-9720 merge r1502301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505040 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:55:50 +00:00
Suresh Srinivas bddbc5b0ed Revert r1505037 to fix the commit text
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505039 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:52:56 +00:00
Suresh Srinivas 8f3eba332d HADOOP-9691. Merge r1501615 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505037 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:50:15 +00:00
Suresh Srinivas 6c37a1584e HADOOP-9688 merge r1500843 and r1500847 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505030 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 21:37:43 +00:00
Suresh Srinivas 3f901c051d Revert the merge r1505005
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505009 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 20:49:13 +00:00
Suresh Srinivas fa89218fc8 HADOOP-9688 merge r1500843 and r1500847, and HADOOP-9720 merge r1502301 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505005 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 20:41:10 +00:00
Alejandro Abdelnur 7d613f766e ADOOP-9643. org.apache.hadoop.security.SecurityUtil calls toUpperCase(Locale.getDefault()) as well as toLowerCase(Locale.getDefault()) on hadoop.security.authentication value. (markrmiller@gmail.com via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504966 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 19:02:46 +00:00
Daryn Sharp 69aaf11467 merge -c 1504874 FIXES: HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504875 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 13:39:50 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
Arun Murthy 1f65519b8a Fixed CHANGES.txt to reflect that new content in branch-2 goes to hadoop-2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504743 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:30:18 +00:00
Luke Lu 62f557775b HADOOP-9164. Print paths of loaded native libraries in NativeLibraryChecker. (Binglin Chang via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504706 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 22:44:43 +00:00
Chris Nauroth bddf1659f8 HDFS-4996. Merging change r1504679 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504682 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 22:05:10 +00:00
Jason Darrell Lowe 9b1bc20045 svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 20:47:58 +00:00
Kihwal Lee 727acb377e svn merge -c 1503976 merging to branch-2 to fix HADOOP-9738. TestDistCh fails. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503977 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 02:24:18 +00:00
Jason Darrell Lowe 2767f51220 svn merge -c 1503954 FIXES: HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503955 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:12:05 +00:00
Daryn Sharp 192f6b86cc HADOOP-9683. [RPC v9] Wrap IpcConnectionContext in RPC headers (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503830 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 18:59:29 +00:00
Colin McCabe 62f5c14df2 HADOOP-9618. thread which detects GC pauses (Todd Lipcon via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503810 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 17:57:44 +00:00
Suresh Srinivas ecf57540da HDFS-4903. Merge 1503570 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503572 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 06:49:05 +00:00
Kihwal Lee 7a4bd44dc9 svn merge -c 1503390 merging from trunk to fix HADOOP-9707.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503394 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 18:17:35 +00:00
Harsh J 5699dbc35f HADOOP-9241. DU refresh interval is not configurable. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502955 13f79535-47bb-0310-9956-ffa450edef68
2013-07-14 11:01:02 +00:00
Colin McCabe d93e7ca15d HADOOP-9703. org.apache.hadoop.ipc.Client leaks threads on stop (Tsuyoshi OZAWA via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502704 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 21:55:15 +00:00
Chris Nauroth 5039a956ff HDFS-4372. Merging change r1502120 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502419 13f79535-47bb-0310-9956-ffa450edef68
2013-07-12 04:35:43 +00:00
Colin McCabe 8c4362709a HADOOP-9417. Support for symlink resolution in LocalFileSystem / RawLocalFileSystem. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502323 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 18:32:06 +00:00
Steve Loughran 31d59d378a HADOOP-9432 Add support for markdown .md files in site documentation
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502259 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 16:03:44 +00:00
Alejandro Abdelnur f0983d958d updating CHANGES.txt after committing MAPREDUCE-5333,HADOOP-9661,HADOOP-9355,HADOOP-9673,HADOOP-9414,HADOOP-9416,HDFS-4797,YARN-866,YARN-736,YARN-883 to 2.1-beta branch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502074 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 00:21:49 +00:00
Chris Nauroth 9bd8745846 MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 23:08:34 +00:00
Chris Nauroth 57366664dd HADOOP-8440. Merging change r1501424 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501435 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 18:26:08 +00:00
Alejandro Abdelnur dc18424723 HDFS-4841. FsShell commands using secure webhfds fail ClientFinalizer shutdown hook. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501006 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 23:11:03 +00:00
Konstantin Boudnik e9b658b021 HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500140 13f79535-47bb-0310-9956-ffa450edef68
2013-07-05 21:40:46 +00:00
Colin McCabe dbfa01ff96 HADOOP-9416. Add new symlink resolution methods in FileSystem and FileSystemLinkResolver. (awang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499604 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 23:31:38 +00:00
Brandon Li c8befb6c69 Fix build version for nfs projects in branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499224 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 06:36:58 +00:00
Brandon Li 07a08e2941 HDFS-4762,HDFS-4948. Merging change r1499029,r1499041,r1499152 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499190 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 03:55:42 +00:00
Brandon Li b1d5f9519c HADOOP-9515. Merging change r1493924 and r1493929 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499167 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 00:46:54 +00:00
Brandon Li b0acd23d92 HADOOP-9509. Merging change r1490845 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499156 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 00:05:40 +00:00
Enis Soztutar 6384d35ab8 HADOOP-9660 Merge change 1499132 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499142 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 22:54:47 +00:00
Chris Nauroth 65bbb30101 HADOOP-9681. Merging change r1499069 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499070 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 19:27:16 +00:00
Chris Nauroth 2f0d853fd6 HADOOP-9678. Merging change r1498786 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498787 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 05:38:22 +00:00
Colin McCabe dd25abb825 HADOOP-9676. Make maximum RPC buffer size configurable (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498740 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 23:29:03 +00:00
Colin McCabe 3121145b9a HADOOP-9414. Refactor out FSLinkResolver and relevant helper methods.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498728 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 22:35:11 +00:00
Thomas Graves 9520013838 Preparing for 0.23.9 release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498478 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 14:27:48 +00:00
Luke Lu 805fa42025 LF normalization according to HADOOP-8912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498023 13f79535-47bb-0310-9956-ffa450edef68
2013-06-29 20:20:59 +00:00
Arun Murthy 448d56ad31 Merge -c 1497922 from trunk to branch-2 to fix HADOOP-9665. Fixed BlockDecompressorStream#decompress to return -1 rather than throw EOF at end of file. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497923 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 21:07:12 +00:00
Colin McCabe 7edc5f5456 HADOOP-9673. NetworkTopology: When a node cannot be added, print out its location for diagnostic purposes
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497180 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 01:40:05 +00:00
Arun Murthy cb74ad6ba0 Release notes for hadoop-2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496798 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 07:20:55 +00:00
Arun Murthy de82f25604 Preparing for hadoop-2.1.0-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496790 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 06:51:07 +00:00
Vinod Kumar Vavilapalli a7f7d5b440 YARN-874. Making common RPC to switch to not switch to simple when other mechanisms are enabled and thus fix YARN/MR test failures after HADOOP-9421. Contributed by Daryn Sharp and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1496692 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496693 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 00:43:05 +00:00
Colin McCabe 7880da2743 HADOOP-9355. Abstract Symlink tests to use either FileContext or FileSystem (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496691 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 00:36:01 +00:00
Chris Nauroth bc4c8b12a6 HADOOP-9656. Merging change r1496597 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496600 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 19:26:48 +00:00
Colin McCabe ba014fe64b HADOOP-9355. Abstract symlink tests to use either FileContext or FileSystem. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496306 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 00:28:34 +00:00
Alejandro Abdelnur 4d5bf5f130 HADOOP-9661. Allow metrics sources to be extended. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496228 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 21:43:01 +00:00
Colin McCabe 16dafcf5c3 HADOOP-9439. JniBasedUnixGroupsMapping: fix some crash bugs (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496115 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 16:25:52 +00:00
Daryn Sharp fe1ec7a19e svn merge -c 1495577 FIXES: HADOOP-9421. [RPC v9] Convert SASL to use ProtoBuf and provide negotiation capabilities (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495581 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 20:13:22 +00:00
Sanjay Radia 85ea4d19a2 Merged HADOOP-9619 svn merge -c 1495564
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495573 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 20:06:24 +00:00
Luke Lu 7ba5cd6be9 HADOOP-9451. Fault single-layer config if node group topology is enabled. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494889 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 08:43:56 +00:00
Suresh Srinivas 859acc57d5 Cleanup CHANGES.txt and move some of the jiras to the right section
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494832 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 01:21:38 +00:00
Christopher Douglas 47b0cebe1a HADOOP-8608. Add Configuration API for parsing time durations.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494825 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 00:44:25 +00:00
Aaron Myers 7e4a671102 Fix up a little test failure.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494789 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 22:30:52 +00:00
Chris Nauroth 218178ca11 HADOOP-9264. Merging change r1441172 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494705 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 17:39:30 +00:00
Aaron Myers 683448125e Clean up an IPC error message. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494703 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 17:31:41 +00:00
Suresh Srinivas ee748a1063 Cleanup CHANGES.txt for 2.1.0-beta section and make it consistent with trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494430 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 03:33:50 +00:00
Chris Nauroth 8e81e6fcaf HADOOP-9624. Merging change r1494363 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494365 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 23:07:25 +00:00
Chris Nauroth 6c2be5253e HADOOP-9637. Merging change r1494341 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494344 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 22:19:51 +00:00
Jason Darrell Lowe 89fb4a48f8 svn merge -c 1494331 FIXES: HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error. Contributed by Ashwin Shankar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494336 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 22:04:41 +00:00
Aaron Myers 6feda0aa3b HDFS-4906. HDFS Output streams should not accept writes after being closed. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494304 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 21:08:37 +00:00
Arun Murthy a37125a531 Merge -c 1493693 from trunk to branch-2 to fix HADOOP-9517. Documented various aspects of compatibility for Apache Hadoop. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493694 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 09:33:14 +00:00
Vinod Kumar Vavilapalli e40b5a3eb9 HADOOP-9649. Promoted YARN service life-cycle libraries into Hadoop Common for usage across all Hadoop projects. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1493650 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493651 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:41:49 +00:00
Arun Murthy 68807a65c2 Merge -c 1493623 from trunk to branch-2 to fix YARN-387. Renamed YARN protocols for consistency. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493624 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 02:29:56 +00:00
Chris Nauroth 7742b1b92e HADOOP-9632. Merging change r1493451 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493453 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 03:33:23 +00:00
Colin McCabe efd12d9d3b revert HADOOP-9646 to fix hadoop-streaming compile issue
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493251 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 21:22:41 +00:00
Colin McCabe 905f7ff12d HADOOP-9646. Inconsistent exception specifications in FileUtils#chmod (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493242 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 20:59:32 +00:00
Colin McCabe 043d5fc97d HDFS-3934. duplicative dfs_hosts entries handled wrong (all files) (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493234 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 20:25:12 +00:00
Arun Murthy edcdd487b9 Merge -c 1492958 from trunk to branch-2 to fix YARN-812. Set default logger for application summary logger to hadoop.root.logger. Contributed by Siddarth Seth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492959 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 06:04:49 +00:00
Chris Nauroth 7f2848ba73 HADOOP-9638. Merging change r1492297 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492314 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 18:07:31 +00:00
Arpit Gupta 13381835cc HADOOP-9625. Merging change r1491907 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491959 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 21:04:52 +00:00
Arpit Gupta 03f6e8ab56 HADOOP-9532. Merging change r1478072 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491953 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 20:56:09 +00:00
Colin McCabe 68671e453b HADOOP-9635. Fix potential stack overflow in DomainSocket.c (V. Karthik Kumar via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491943 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 20:29:06 +00:00
Luke Lu ff2dcbc408 HADOOP-9630. [RPC v9] Remove IpcSerializationType. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491683 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 03:31:10 +00:00
Aaron Myers e395e29279 HADOOP-9604. Javadoc of FSDataOutputStream is slightly inaccurate. Contributed by Jingguo Yao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491669 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 01:20:44 +00:00
Jason Darrell Lowe a78d8ed016 svn merge -c 1491548 FIXES: HADOOP-9581. hadoop --config non-existent directory should result in error. Contributed by Ashwin Shankar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491549 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 18:14:16 +00:00
Konstantin Boudnik 6e9ad986eb Setting 2.0.5-alpha release date
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491137 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 04:51:28 +00:00
Ivan Mitic 13e1c7ad4e HADOOP-9599. Merging change r1491030 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491035 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 19:18:28 +00:00