Commit Graph

1121 Commits

Author SHA1 Message Date
Sanford Ryza a51157a1ee HADOOP-10127. Add ipc.client.connect.retry.interval to control the frequency of connection retries (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547627 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 22:47:15 +00:00
Andrew Wang cd585dcc2f HDFS-5560. Trash configuration log statements prints incorrect units. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547267 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 03:33:12 +00:00
Arun Murthy f5dc7b0c6b Renamed releases. 2.2.1 -> 2.3.0 & 2.3.0 -> 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547140 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:43:55 +00:00
Colin McCabe 137bf488a5 HADOOP-10130. RawLocalFS pread does not track FileSystem Statistics (Binglin Chang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547119 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 17:30:00 +00:00
Steve Loughran 0293279c58 HADOOP-10135 writes to swift fs over partition size leave temp files and empty output file
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546957 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 11:00:00 +00:00
Uma Maheswara Rao G 003c57ca9b Merge. HADOOP-10132. RPC#stopProxy() should log the class of proxy when IllegalArgumentException is encountered. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546193 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 20:57:37 +00:00
Suresh Srinivas e3f9960a7d HADOOP-10126. Merge change 1545376 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545379 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 19:46:46 +00:00
Jonathan Turner Eagles e34bc8dc97 HADOOP-10111. Allow DU to be initialized with an initial value (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544241 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 16:19:18 +00:00
Uma Maheswara Rao G 87a23fa27f Merge HADOOP-9114. After defined the dfs.checksum.type as the NULL, write file and hflush will through java.lang.ArrayIndexOutOfBoundsException. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544190 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 14:08:49 +00:00
Steve Loughran 92d615a37a HADOOP-10103 commons-lang->2.6
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544173 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 13:36:59 +00:00
Arun Murthy 258775c9fd Merge -c 1543542 from trunk to branch-2 to fix HADOOP-10047. Add a direct-buffer based apis for compression. Contributed by Gopal V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543543 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 19:30:04 +00:00
Arun Murthy 71f9f49590 Revert HADOOP-10047, wrong patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543539 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 19:26:01 +00:00
Arun Murthy 9ff2130eeb Merge -c 1543456 from trunk to branch-2 to fix HADOOP-10047. Add a direct-buffer based apis for compression. Contributed by Gopal V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543457 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 15:39:16 +00:00
Jing Zhao b07bd1006d HADOOP-10107. Merge change r1543335 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543338 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:44:30 +00:00
Arpit Agarwal 2966ba01cf HADOOP-10110. Merging change r1543190 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543196 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 22:17:41 +00:00
Alejandro Abdelnur eba4c42d6a HADOOP-10100. MiniKDC shouldn't use apacheds-all artifact. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542124 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 23:53:12 +00:00
Daryn Sharp 4495d087a7 svn merge -c 1542111 FIXES: HADOOP-9955. RPC idle connection closing is extremely inefficient (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542112 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 22:57:17 +00:00
Chris Nauroth e28947c428 HADOOP-10094. Merging change r1541991 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541993 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 17:49:33 +00:00
Steve Loughran 2d39336213 HADOOP-10067 Missing POM dependency on jsr305
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541861 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 09:42:35 +00:00
Tsz-wo Sze 79e34c2a3c svn merge -c 1541750 from trunk for HADOOP-10095. In CodecPool, synchronize pool and codecList separately in order to reduce lock contention.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541751 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 22:51:43 +00:00
Daryn Sharp d993d01cdf svn merge -c 1541736 FIXES: HADOOP-9956. RPC listener inefficiently assigns connections to readers (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541743 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:48:21 +00:00
Alejandro Abdelnur 0c220f30b3 HADOOP-10078. KerberosAuthenticator always does SPNEGO. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541721 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:13:18 +00:00
Steve Loughran 572355f632 HADOOP-9594 commons-math
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541668 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:30:21 +00:00
Chris Nauroth 2cdd8f1b63 HADOOP-10093. Merging change r1541343 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541344 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 01:17:57 +00:00
Chris Nauroth b13c6bda43 HADOOP-10088. Merging change r1540270 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 07:38:16 +00:00
Chris Nauroth 5406659b12 HADOOP-9660. Merging change r1539535 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539536 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 06:52:19 +00:00
Colin McCabe 825103c331 move HADOOP-9623 to 2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539261 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:08:33 +00:00
Colin McCabe 5324b77a60 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
Colin McCabe 2946a3afdf HADOOP-10079. log a warning message if group resolution takes too long (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538114 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 00:48:29 +00:00
Andrew Wang 4dfa0bf99f HADOOP-9898. Set SO_KEEPALIVE on all our sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537638 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:56:42 +00:00
Chris Nauroth abddbcd9bf HADOOP-10072. Merging change r1535918 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535919 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 04:32:25 +00:00
Jonathan Turner Eagles 076e78d021 HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535267 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 02:40:49 +00:00
Jonathan Turner Eagles 16cc6640b7 HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535088 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 18:12:02 +00:00
Jonathan Turner Eagles f64cb91d67 HADOOP-9291. enhance unit-test coverage of package o.a.h.metrics2 (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534476 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 03:48:37 +00:00
Colin McCabe 75968551bd HDFS-5276. FileSystem.Statistics should use thread-local counters to avoid multi-threaded performance issues on read/write. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533670 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 00:38:13 +00:00
Chris Nauroth 2c1afcf3d0 HADOOP-10055. Merging change r1533188 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533189 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:16:02 +00:00
Jonathan Turner Eagles 186581fef2 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532929 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:47:16 +00:00
Suresh Srinivas bc18c6f842 HADOOP-10005. Merge 1532907 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:05:23 +00:00
Chris Nauroth 9cda28ef0d HADOOP-9897. Merging change r1532880 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532883 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:15:09 +00:00
Andrew Wang ea64a5a48d HADOOP-100046. Print a log message when SSL is enabled (David S. Wang via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532479 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:40:45 +00:00
Jonathan Turner Eagles 50ac80a44f HADOOP-9494. Excluded auto-generated and examples code from clover reports (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532014 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 18:25:45 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Jing Zhao 1e24c3cdad HADOOP-10039. Merge change r1531158 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531159 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 01:25:58 +00:00
Chris Nauroth e9ae7ba096 HADOOP-10031. Merging change r1530823 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530827 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 23:05:05 +00:00
Daryn Sharp 2031005eeb HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:43 +00:00
Chris Nauroth 292259b0b8 HADOOP-10030. Merging change r1530462 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530465 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 23:44:32 +00:00
Jonathan Turner Eagles ea724f0651 HADOOP-9199. Cover package org.apache.hadoop.io with unit tests (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530406 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 19:48:07 +00:00
Arun Murthy c3dff760d9 Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:05:03 +00:00
Jing Zhao 2aee8b321b HADOOP-10028. Merge change r1530100 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530101 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 22:42:01 +00:00
Arun Murthy 3b514585f1 Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:18 +00:00
Jing Zhao 3f0c90f6b5 HADOOP-10017. Merge change r1529571 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529572 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 06:24:32 +00:00
Jason Darrell Lowe bab129d135 svn merge -c 1529296 FIXES: HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy. Contributed by Vadim Bondarev, Andrey Klochkov and Nathan Roberts
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529301 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 21:03:16 +00:00
Jason Darrell Lowe f2e97aad31 svn merge -c 1528620 FIXES: HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, org.apache.hadoop.util.hash. Contributed by Vadim Bondarev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528621 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 20:55:26 +00:00
Jason Darrell Lowe 0cf79e3e66 svn merge -c 1528502 FIXES: HADOOP-9063. enhance unit-test coverage of class org.apache.hadoop.fs.FileUtil. Contributed by Ivan A. Veselovsky
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528506 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 14:53:28 +00:00
Todd Lipcon 1c48b4d04c HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528292 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:44:43 +00:00
Colin McCabe 3631361653 move HADOOP-9758 to the branch-2.1.2 section
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:36:08 +00:00
Suresh Srinivas 67ad6d4a92 HADOOP-10003. Merging 1528256 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528263 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 23:06:28 +00:00
Luke Lu 4ff49a7516 HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize ReflectionUtils.printThreadInfo. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527651 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 17:01:51 +00:00
Steve Loughran 905be853a1 HADOOP-10006. Compilation failure in trunk for o.a.h.fs.swift.util.JSONUtil
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:30:09 +00:00
Steve Loughran c35a34d3ce HADOOP-8545. Filesystem Implementation for OpenStack Swift
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526852 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:29:07 +00:00
Sanford Ryza d2e94731ee HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526668 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:26:04 +00:00
Chris Nauroth e45c32fced HADOOP-9948. Merging change r1526606 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:11:40 +00:00
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +00:00
Colin McCabe 138fd7581f HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:58:37 +00:00
Andrew Wang 101664055c Move CHANGES.txt entry for HADOOP-9761
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526291 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:35:55 +00:00
Ivan Mitic 88eb46c7c2 HADOOP-9776. Merging change r1526109 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526110 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 05:22:25 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
Chris Nauroth 8338e33f57 HADOOP-9977. Merging change r1525657 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525658 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 17:52:58 +00:00
Ivan Mitic fe3e796ed5 HADOOP-9791. Merging change r1524631 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524633 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 06:59:41 +00:00
Colin McCabe 7ce1a859a8 HADOOP-9929. Insufficient permission for a path reported as file not found. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524610 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 02:03:42 +00:00
Brandon Li 3a7e3e0881 HADOOP-9669. Merging change r1524259 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524260 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 00:15:12 +00:00
Steve Loughran 5741f754d7 moved location of HADOOP-9350 change as now in branch-2.1.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524007 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 12:30:47 +00:00
Arun Murthy 3836473c73 Preparing for hadoop-2.1.1-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:23:39 +00:00
Arun Murthy 1d6a45a02c Merge -c 1523885 from trunk to branch-2 to fix HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3). Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523886 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 04:54:04 +00:00
Chris Nauroth b52ae58928 HADOOP-9935. Revert from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523835 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 23:12:01 +00:00
Alejandro Abdelnur 3638f42a50 HADOOP-9962. in order to avoid dependency divergence within Hadoop itself lets enable DependencyConvergence. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523600 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:41:00 +00:00
Alejandro Abdelnur 89df2ae5c9 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523597 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:31:17 +00:00
Chris Nauroth c2a1353c29 HADOOP-9935. Merging change r1523403 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523404 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 04:40:54 +00:00
Chris Nauroth 7bf877f4ea HADOOP-9557. Merging change r1523185 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 05:27:46 +00:00
Aaron Myers 6a193d7f8e HADOOP-9960. Upgrade Jersey version to 1.9. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523156 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 00:15:07 +00:00
Aaron Myers 27c1c0079e HADOOP-9945. HAServiceState should have a state for stopped services. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523150 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:58:45 +00:00
Steve Loughran 721326be6a HADOOP-9350. Hadoop not building against Java7 on OSX
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522866 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 11:04:02 +00:00
Andrew Wang 15e3c010ec HADOOP-9958. Add old constructor back to DelegationTokenInformation to unbreak downstream builds. (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522709 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 20:06:15 +00:00
Andrew Wang 7cb29ba170 Revert HADOOP-9877 because of issues reported at HADOOP-9912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520712 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 22:53:26 +00:00
Jonathan Turner Eagles 0dd1c596f3 HADOOP-8704. add request logging to jetty/httpserver (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520676 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 19:46:32 +00:00
Todd Lipcon a7b2749114 HADOOP-9908. Fix NPE when versioninfo properties file is missing. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520335 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 14:41:43 +00:00
Colin McCabe a1db4783a4 HADOOP-9915. o.a.h.fs.Stat support on Mac OS X (Contributed by Binglin Chang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520192 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 02:00:06 +00:00
Kihwal Lee 2935b50d85 svn merge -c 1520126 merging from trunk to branch-2 to fix HADOOP-9932.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520127 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 19:59:52 +00:00
Luke Lu 6ebdbd4a0a HADOOP-9916. Fix race in ipc.Client retry. (Binglin Chang via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519974 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 10:34:56 +00:00
Ivan Mitic 5f4abaa3dc HADOOP-9924. Merging change r1519891 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519894 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 01:21:52 +00:00
Sanford Ryza ab02296741 HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 02:13:11 +00:00
Ivan Mitic f83da5780c HADOOP-9774. Merging change r1518865 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518871 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 01:18:33 +00:00
Andrew Wang 79ef532870 HADOOP-9909. org.apache.hadoop.fs.Stat should permit other LANG. (Shinichi Yamashita via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518863 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 00:37:09 +00:00
Sanford Ryza b23888256e HADOOP-9889. Refresh the Krb5 configuration when creating a new kdc in Hadoop-MiniKDC (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518849 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 22:41:20 +00:00
Arpit Agarwal 125c68e225 HADOOP-9894. Merging change r1518420 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518421 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 00:11:58 +00:00
Sanford Ryza f70e947392 HADOOP-9906. Move HAZKUtil to o.a.h.util.ZKUtil and make inner-classes public (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518307 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 18:04:27 +00:00
Harsh J 53b04516fe HADOOP-9910. proxy server start and stop documentation wrong. Contributed by Andre Kelpe. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518304 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 17:57:39 +00:00
Tsz-wo Sze 95c4570eb1 HADOOP-9899. Remove the debug message, added by HADOOP-8855, from KerberosAuthenticator.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516745 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 08:40:15 +00:00
Chris Nauroth 0a0466c026 HADOOP-9887. Merging change r1516608 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516612 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 21:18:46 +00:00
Andrew Wang 1bc892472c HADOOP-9877. Fix listing of snapshot directories in globStatus. (Binglin Chang via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516236 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:06:58 +00:00
Luke Lu d83061b71b HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 10:13:17 +00:00
Arpit Gupta 16f7870141 HADOOP-9886. Merging change r1516034 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516038 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 23:51:33 +00:00
Jonathan Turner Eagles 017bbeade1 HADOOP-9686. Easy access to final parameters in Configuration (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516009 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 22:45:49 +00:00
Andrew Wang d21d74744c Revert HADOOP-9877, patch did not apply cleanly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515998 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 22:34:46 +00:00
Andrew Wang 81960c2f91 HADOOP-9877. Fix listing of snapshot directories in globStatus. (Binglin Chang via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515956 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 20:24:03 +00:00
Sanford Ryza 11123a1b26 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515713 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 06:29:34 +00:00
Steve Loughran c3d07a0304 HADOOP-9487 Deprecation warnings in Configuration should go to their own log or otherwise be suppressible
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515671 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 23:49:11 +00:00
Alejandro Abdelnur 32bdd011ef HADOOP-9866. convert hadoop-auth testcases requiring kerberos to use minikdc. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515658 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 23:04:23 +00:00
Alejandro Abdelnur 540896b39e HADOOP-9860. Remove class HackedKeytab and HackedKeytabEncoder from hadoop-minikdc once jira DIRSERVER-1882 solved. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515653 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 22:55:25 +00:00
Jing Zhao 8c6234aa00 HADOOP-9880. Merge change r1514913 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514915 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 22:39:26 +00:00
Colin McCabe 15bdf14151 HADOOP-9865. FileContext#globStatus has a regression with respect to relative path. (Contributed by Chaun Lin)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514536 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 23:10:06 +00:00
Arun Murthy aa3f77675b Preparing for hadoop-2.1.0-beta rc2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514471 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 20:34:25 +00:00
Kihwal Lee 47e4c2c121 svn merge -c 1514448 merging from trunk to branch-2 to fix HADOOP-9868.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514453 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 19:31:07 +00:00
Colin McCabe 03420bbb4d HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514153 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 04:06:00 +00:00
Suresh Srinivas ec123f9657 HADOOP-9381. Merge 1514089 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514103 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 00:04:40 +00:00
Colin McCabe bdc291da6a 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@1514090 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 23:18:26 +00:00
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
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
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
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
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
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