Commit Graph

258 Commits

Author SHA1 Message Date
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:37:46 +00:00
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
Zhijie Shen c9b6c3c36c YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi.
svn merge --ignore-ancestry -c 1565868 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565869 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 02:18:06 +00:00
Arpit Agarwal 152f1b17c6 HADOOP-9830. Merging r1561951 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561952 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 06:42:51 +00:00
Arpit Agarwal be32b2d1ad HADOOP-10086. Merging r1561776 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561777 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:36:07 +00:00
Konstantin Boudnik f3136cd6b9 HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov.
Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 22:31:27 +00:00
Andrew Wang c4194399d3 Merge HDFS-4949 changes from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 21:43:00 +00:00
Alejandro Abdelnur b9623c6308 HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559231 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 19:31:01 +00:00
Vinod Kumar Vavilapalli f35f702426 YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1557801 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:34:39 +00:00
Steve Loughran b8eb777a43 HADOOP-10147 HDFS-5678 Upgrade to commons-logging 1.1.3 to avoid potential deadlock in MiniDFSCluster
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 13:37:04 +00:00
Steve Loughran 9c2534506f HADOOP-9611 mvn-rpmbuild against google-guice > 3.0 yields missing cglib dependency
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551915 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 11:14:30 +00:00
Steve Loughran fb03925549 HADOOP-10102. Update commons IO from 2.1 to 2.4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547755 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 10:39:36 +00:00
Arun Murthy 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +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
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
Steve Loughran 91342b9820 HADOOP-9594 commons-math
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541667 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:29:56 +00:00
Colin McCabe 60dd68f4bb HADOOP-9623. Update jet3t dependency to 0.9.0 (Amandeep Khurana via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539256 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:02:55 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:20:35 +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
Jason Darrell Lowe 7e812e7126 svn merge -c 1528237 FIXES: MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528242 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:40:01 +00:00
Alejandro Abdelnur 75f9db1c4d YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
Steve Loughran d44334158a HADOOP-8545. Filesystem Implementation for OpenStack Swift
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526848 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:12:42 +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 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
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
Chris Nauroth 4c66560499 HDFS-4491. Merging change r1520479 and r1520482 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520485 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 03:28:00 +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
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
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
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
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
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
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
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
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
Arun Murthy 51bb83eabf Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493571 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 19:10:32 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:34:52 +00:00
Jason Darrell Lowe eb7af141e4 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489250 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:29:37 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:41 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:29:20 +00:00
Konstantin Boudnik d1d9252059 HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487982 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 19:14:26 +00:00
Suresh Srinivas 3694a73ff8 HADOOP-9290. Merge r1476586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
Todd Lipcon 87a1e92453 HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 07:02:57 +00:00
Alejandro Abdelnur 886b5b6756 HADOOP-9550. Remove aspectj dependency. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480784 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 21:29:25 +00:00
Thomas Graves 0a4857fef3 HADOOP-9469. mapreduce/yarn source jars not included in dist tarball Robert Parker via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470059 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 21:59:31 +00:00
Arun Murthy 91a676fc41 Setting version in branch-2 to be 2.0.5-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
Alejandro Abdelnur a29d7b00c9 HADOOP-9406. hadoop-client leaks dependency on JDK tools jar. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456730 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 00:28:27 +00:00
Suresh Srinivas 434388ff63 HADOOP-9407. Merge 1456704 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456705 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 22:35:12 +00:00
Suresh Srinivas 6485664b15 HADOOP-9334. Merge change 1450463 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 22:02:30 +00:00
Alejandro Abdelnur 2d35d0063a HADOOP-8924. Add maven plugin alternative to shell script to save package-info.java. Contributed by Alejandro Abdelnur and Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446018 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:30:50 +00:00
Thomas Graves ecfd15693e HADOOP-9302. HDFS docs not linked from top level (Andy Isaacson via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445648 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:05:21 +00:00
Alejandro Abdelnur f5503bd44a MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:53:06 +00:00
Arun Murthy 196341fc09 Setting version to 2.0.4-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:23:45 +00:00
Alejandro Abdelnur 7194c52ec3 HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425527 13f79535-47bb-0310-9956-ffa450edef68
2012-12-23 21:15:42 +00:00
Todd Lipcon fd032dd9e3 Merge HDFS-3077 (QuorumJournalManager) backport into branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417596 13f79535-47bb-0310-9956-ffa450edef68
2012-12-05 19:22:17 +00:00
Thomas White db8545d924 Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 15:16:57 +00:00
Thomas White d488a59497 Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 13:57:19 +00:00
Alejandro Abdelnur 60cd4f4c7a reverting commit 1399959 (HADOOP-8887 again)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399971 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:30:30 +00:00
Alejandro Abdelnur c6f60985a8 HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399959 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 03:59:39 +00:00
Suresh Srinivas a2b01168e2 HDFS-8887 reverting commit r1399904 due to build failure and other issues
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399949 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 02:22:24 +00:00
Alejandro Abdelnur 26e7aae08e HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399904 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 22:49:07 +00:00
Robert Joseph Evans 6d97a5001d svn merge -c 1399426 FIXES: HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399427 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 20:51:28 +00:00
Todd Lipcon 029f68bd96 HADOOP-8889. Upgrade to Surefire 2.12.3. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394880 13f79535-47bb-0310-9956-ffa450edef68
2012-10-06 00:58:29 +00:00
Eli Collins 04988bb77b HDFS-3753. Tests don't run with native libraries. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393188 13f79535-47bb-0310-9956-ffa450edef68
2012-10-02 21:15:10 +00:00
Aaron Myers cae0e5653a HADOOP-8851. Use -XX:+HeapDumpOnOutOfMemoryError JVM option in the forked tests. Contributed by Ivan A. Veselovsky.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1392469 13f79535-47bb-0310-9956-ffa450edef68
2012-10-01 17:45:29 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Siddharth Seth 00874120d2 merge YARN-29 from trunk. Add a yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377782 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 18:30:42 +00:00
Eli Collins 710c4e5906 HADOOP-8687. Upgrade log4j to 1.2.17. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372653 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 22:20:22 +00:00
Alejandro Abdelnur 2a178a8d0b Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 18:15:35 +00:00
Robert Joseph Evans 6817f87461 svn merge -c 1367726. FIXES: MAPREDUCE-4483. 2.0 build does not work (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367729 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:50:11 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
Robert Joseph Evans 75af3cba6b svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 15:53:38 +00:00
Robert Joseph Evans 9a0fc23c82 svn merge -c 1355019 FIXES: HADOOP-8535. Cut hadoop build times in half (Job Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355020 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 14:23:56 +00:00
Thomas Graves 5f69497e35 merge -r 1351362:1351363 from trunk. FIXES: HADOOP-8495
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351364 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 14:43:51 +00:00
Eli Collins 3f1179c966 HADOOP-8485. Don't hardcode "Apache Hadoop 0.23" in the docs. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347134 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 21:14:55 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Thomas Graves b35de62e1d MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339652 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 15:31:19 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Thomas Graves c993d1bac5 merge -r 1338834:1338835 from trunk. FIXES: MAPREDUCE-4238
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338841 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:15:43 +00:00
Robert Joseph Evans b9d8f1737b svn merge -c 1332775 FIXES: HADOOP-8317. Update maven-assembly-plugin to 2.3 - fix build on FreeBSD (Radim Kolar via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332776 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 18:53:08 +00:00
Thomas White a7e688c6a8 Merge -r 1330426:1330427 from trunk to branch-2. Fixes: MAPREDUCE-4193.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330429 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 17:22:53 +00:00
Alejandro Abdelnur 06428cdcc1 Merge -r 1329489:1329490 from trunk to branch. FIXES: HADOOP-8284
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329495 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:24 +00:00
Todd Lipcon ab0e99c0ee HADOOP-8117. Upgrade test build to Surefire 2.12. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327706 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 22:22:31 +00:00
Thomas Graves 53c866784b merge -r 1310035:1310036 from trunk. FIXES: HADOOP-8180
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310037 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 19:40:04 +00:00
Alejandro Abdelnur 98f0abb721 Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:25:18 +00:00
Todd Lipcon 98cb813248 HDFS-3187. Upgrade guava to 11.0.2. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309182 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 22:30:38 +00:00
Eli Collins c482113730 HADOOP-8211. svn merge -c 1308006 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308007 13f79535-47bb-0310-9956-ffa450edef68
2012-04-01 02:54:25 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Suresh Srinivas 40276d7f78 HDFS-1623. Merging change r1296534 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299412 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 17:55:58 +00:00
Arun Murthy 736a8ed760 Merge -c 1296905 from trunk to branch-0.23 to fix HADOOP-8137. Added links to CLI manuals to the site.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296906 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 23:55:32 +00:00
Arun Murthy 700aee6745 Merge -c 1296861 from trunk to branch-0.23 to fix HADOOP-8123. Use java.home rather than env.JAVA_HOME for java in the project.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296862 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 19:38:09 +00:00
Alejandro Abdelnur 4e282dfc83 Merge -r 1295177:1295178 from trunk to branch. FIXES: MAPREDUCE-3933
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295179 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 16:21:42 +00:00
Alejandro Abdelnur 529515100c Merge -r 1294783:1294784 from trunk to branch. FIXES: HADOOP-8104
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294788 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 19:01:10 +00:00
Alejandro Abdelnur ee11677f8a Merge -r 1173738:1173739 from trunk to branch. FIXES: HADOOP-7621
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294774 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 18:42:35 +00:00
Tsz-wo Sze def75f7560 Merge r1293501 through r1293896 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 17:58:14 +00:00
Arun Murthy c79ae7a8db Moving branch-0.23 to version 0.23.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:58:06 +00:00
Tsz-wo Sze bd3c2b26ec Merge r1244222 through r1245749 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1245750 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 20:43:55 +00:00
Alejandro Abdelnur c9ffa03b74 Merge -r 1245320:1245321 from trunk to branch. FIXES: HADOOP-8083
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245322 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 05:50:53 +00:00
Alejandro Abdelnur 24fd4a0246 Merge -r 1245249:1245250 from trunk to branch. FIXES: HADOOP-8066
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245251 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 23:23:20 +00:00
Alejandro Abdelnur 91ebbeefb4 Merge -r 1245109:1245110 from trunk to branch. FIXES: HADOOP-8082
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245111 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 18:14:29 +00:00
Tsz-wo Sze fd0b6a9596 Merge r1242606 through r1244221 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1244226 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:49:02 +00:00
Mahadev Konar 9a40365296 MAPREDUCE-3852. Test TestLinuxResourceCalculatorPlugin failing. (Thomas Graves via mahadev) - Merging r1243418 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243420 13f79535-47bb-0310-9956-ffa450edef68
2012-02-13 05:42:36 +00:00
Alejandro Abdelnur e98fdc037c Merge -r 1242986:1242987 from trunk to branch. FIXES: HADOOP-8051
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242988 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 00:04:08 +00:00
Tsz-wo Sze 6c0178e7e5 Merge r1241554 through r1242605 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1242642 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 03:04:05 +00:00
Alejandro Abdelnur 3ca0d208d1 Merge -r 1242504:1242505 from trunk to branch. FIXES: HADOOP-8035
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 20:42:39 +00:00
Arun Murthy 78971a4267 Set version to 0.23.2-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 08:12:18 +00:00
Tsz-wo Sze 88bf529cfd Merge r1240450 through r1241553 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1241555 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 19:12:19 +00:00
Mahadev Konar 43d921b0ad MAPREDUCE-3791. can't build site in hadoop-yarn-server-common. (mahadev) - Merging r1240587 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240588 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 18:45:17 +00:00
Tsz-wo Sze 2f0489edab Merge r1239398 through r1240449 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1240450 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 03:40:45 +00:00
Robert Joseph Evans 220317c188 svn merge -c 1240232 fixes HADOOP-8018
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240236 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 16:33:18 +00:00
Tsz-wo Sze fe9369fb3c Merge r1237584 through r1239397 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1239398 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:24:15 +00:00
Tsz-wo Sze fc5f04263d svn merge -c 1239386 from trunk for HADOOP-7470.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239389 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:02:11 +00:00
Tsz-wo Sze 359c746ca7 Merge r1234388 through r1236385 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1236395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 21:37:26 +00:00
Mahadev Konar ccaba4ba7e MAPREDUCE-3737. The Web Application Proxy's is not documented very well. (Robert Evans via mahadev) - Merging r1236371 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236373 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 20:12:24 +00:00
Mahadev Konar 5dd4c5a6f7 MAPREDUCE-3735. Add distcp jar to the distribution (tar). (mahadev) - Merging r1236336 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236337 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 18:14:01 +00:00
Mahadev Konar 505dd18690 MAPREDUCE-2765. DistCp Rewrite. (Mithun Radhakrishnan via mahadev)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236049 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 06:50:00 +00:00
Tsz-wo Sze 6e8fe7af37 Merge r1233741 through r1234387 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1234406 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 19:50:30 +00:00
Mahadev Konar 6b3f5b7bd2 MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) - Merging r1234222 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234224 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 00:55:16 +00:00
Alejandro Abdelnur 25e8aad054 Merge -r 1233089:1233090 from trunk to branch. FIXES: MAPREDUCE-3582
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234100 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 19:54:20 +00:00
Tsz-wo Sze e4e47a7519 Merge r1227776 through r1231827 from 0.23.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1231834 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 04:24:24 +00:00
Tsz-wo Sze 239789c65c Merge r1214114 and r1214499 from trunk for HADOOP-7920.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230896 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:12:49 +00:00
Alejandro Abdelnur b22d5dc992 Merge -r 1227900:1227901 from trunk to branch. FIXES: HADOOP-7907
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227905 13f79535-47bb-0310-9956-ffa450edef68
2012-01-06 00:17:54 +00:00
Alejandro Abdelnur e3e457398e Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:06:52 +00:00
Tsz-wo Sze c8171493aa svn merge -c 1213598 from trunk for HADOOP-7914.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213607 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:51:31 +00:00
Alejandro Abdelnur 24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212064 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:30:53 +00:00
Siddharth Seth 180b0177bb MAPREDUCE-3465. Fixed project pom to create test dirs - and fix failing tests. Contributed by Hitesh Shah
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207728 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 01:13:42 +00:00
Tsz-wo Sze 11b908bf27 svn merge -c 1205626 from trunk for HDFS-2587.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205630 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 22:09:34 +00:00
Arun Murthy fbfe1b0afa Changing branch-0.23 to 0.23.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 23:47:40 +00:00
Todd Lipcon 9912ed1a8b HADOOP-7841. Run tests with non-secure random. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204361 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 06:09:51 +00:00
Alejandro Abdelnur c36a44d11b Merge -r 1203940:1203941 from trunk to branch. FIXES: HADOOP-7590
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203945 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 01:38:22 +00:00
Arun Murthy 60c70eb6d9 Merge -r 1196410:1196412 from trunk to branch-0.23 to fix HADOOP-7789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196413 13f79535-47bb-0310-9956-ffa450edef68
2011-11-02 00:52:20 +00:00
Arun Murthy d0cafa7ad8 Merge -c 1196328 from trunk to branch-0.23 to fix HADOOP-7789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196330 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 22:22:15 +00:00
Arun Murthy 74cc0b509a Merge -c 1195876 from trunk to branch-0.23 to fix HADOOP-7789.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195878 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 08:55:10 +00:00
Thomas White 92fd345d14 Merge -r 1195816:1195817 from trunk to branch-0.23. Fixes: HADOOP-7782.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195821 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:53:00 +00:00
Thomas White 1d54c6e5a7 Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190706 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 00:17:58 +00:00
Alejandro Abdelnur f885fdc98e Merge -r 1187061:1187062 from trunk to branch. FIXES: MAPREDUCE-3204
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190668 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:18:18 +00:00
Alejandro Abdelnur 0eba9bcc06 Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:36:55 +00:00
Alejandro Abdelnur f00b853e6b Merge -r 1182150:1182151 from trunk to branch. FIXES: HADOOP-7642
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190616 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:57:38 +00:00
Mahadev Konar 17161d9041 HADOOP-7709. Running a set of methods in a Single Test Class. (Jonathan Eagles via mahadev) - Merging r1182686 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182687 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 07:00:15 +00:00
Vinod Kumar Vavilapalli 65d5b0b9d3 HADOOP-7606. svn merge -c r1164779 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1165692 13f79535-47bb-0310-9956-ffa450edef68
2011-09-06 14:58:30 +00:00
Aaron Myers 8019d90630 HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1164179 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 17:24:05 +00:00
Tsz-wo Sze 05dbca229f svn merge -c 1163858 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163860 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 23:01:16 +00:00
Tsz-wo Sze 8af6ddf8ec svn merge -c 1163852 from trunk for HADOOP-7579. Contributed by Alejandro Abdelnur
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1163856 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 22:47:51 +00:00
Arun Murthy 02cf28ece0 Merge -r 1162420:1162421 from trunk to branch-0.23 to fix HDFS-2289.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162422 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 19:09:35 +00:00