Commit Graph

521 Commits

Author SHA1 Message Date
Haohui Mai c28449d4b5 HADOOP-11381. Fix findbugs warnings in hadoop-distcp, hadoop-aws, hadoop-azure, and hadoop-openstack. Contributed by Li Lu.
(cherry picked from commit 2e98ad34ce)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:14 -08:00
Steve Loughran e71484be18 HADOOP-11412 POMs mention "The Apache Software License" rather than "Apache License". (Herve Boutemy via stevel)
(cherry picked from commit 07bb0b0bbb)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:13 -08:00
cnauroth 5c32c4b2e4 HADOOP-10809. SyncableDataOutputStream must implement sync method on branch-2. 2014-12-17 14:57:13 -08:00
Aaron T. Myers 66808e6aac HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang.
(cherry picked from commit 24d920b80e)

Conflicts:
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/BasicAWSCredentialsProvider.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInputStream.java
	hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AOutputStream.java
	hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/TestS3AContractRename.java
	hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml
2014-12-17 14:57:13 -08:00
cnauroth 535d98bbb3 HADOOP-11248. Add hadoop configuration to disable Azure Filesystem metrics collection. Contributed by Shanyu Zhao.
(cherry picked from commit 734eeb4f35)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:13 -08:00
cnauroth 1646cc9f29 HADOOP-11188. hadoop-azure: automatically expand page blobs when they become full. Contributed by Eric Hanson.
(cherry picked from commit f4b7e99f4e)
2014-12-17 14:57:13 -08:00
cnauroth 5a737026cc HADOOP-10809. hadoop-azure: page blob support. Contributed by Dexter Bradshaw, Mostafa Elhemali, Eric Hanson, and Mike Liddell.
(cherry picked from commit 2217e2f8ff)
2014-12-17 14:57:13 -08:00
Allen Wittenauer 9a2e4f4f98 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw)
(cherry picked from commit 9f03a7c018)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:13 -08:00
Chris Nauroth cb6eb5931f HADOOP-10690. Lack of synchronization on access to InputStream in NativeAzureFileSystem#NativeAzureFsInputStream#close(). Contributed by Chen He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604236 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 61bf9f7799)
2014-12-17 14:57:12 -08:00
Chris Nauroth 02a3bf8bda HADOOP-10840. Fix OutOfMemoryError caused by metrics system in Azure File System. Contributed by Shanyu Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611247 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0a02b5a19b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:12 -08:00
Chris Nauroth b928b8c775 HADOOP-10728. Metrics system for Windows Azure Storage Filesystem. Contributed by Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao, Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys, Alexander Stojanovic, Brian Swan, and Min Wei.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605187 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0d91576ec3)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:12 -08:00
Chris Nauroth 80d005c66f HADOOP-10689. InputStream is not closed in AzureNativeFileSystemStore#retrieve(). Contributed by Chen He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604233 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 8300b9fb38)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2014-12-17 14:57:12 -08:00
Chris Nauroth 82268d87bc HADOOP-9629. Support Windows Azure Storage - Blob as a file system in Hadoop. Contributed by Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao, Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys, Alexander Stojanovic, Brian Swan, and Min Wei.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601781 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 81bc395deb)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-project/pom.xml
	hadoop-tools/hadoop-tools-dist/pom.xml
	hadoop-tools/pom.xml
2014-12-17 14:56:05 -08:00
Steve Loughran a1b8b9ca59 HADOOP-11412 POMs mention "The Apache Software License" rather than "Apache License". (Herve Boutemy via stevel) 2014-12-16 11:03:02 +00:00
cnauroth 21347a05f5 HADOOP-11394. hadoop-aws documentation missing. Contributed by Chris Nauroth.
(cherry picked from commit 9458cd5bce)
2014-12-12 23:29:40 -08:00
Haohui Mai a1e4a12dc0 HADOOP-11381. Fix findbugs warnings in hadoop-distcp, hadoop-aws, hadoop-azure, and hadoop-openstack. Contributed by Li Lu. 2014-12-09 20:46:44 -08:00
Haohui Mai 1b8b51704a HADOOP-11367. Fix warnings from findbugs 3.0 in hadoop-streaming. Contributed by Li Lu. 2014-12-09 10:42:17 -08:00
Jing Zhao 582f96e41d HADOOP-11354. ThrottledInputStream doesn't perform effective throttling. Contributed by Ted Yu. 2014-12-08 11:09:34 -08:00
cnauroth 00a06e28d4 HADOOP-11201. Hadoop Archives should support globs resolving to files. Contributed by Gera Shegalov.
(cherry picked from commit 79301e80d7)
2014-11-18 17:10:24 -08:00
Arun C. Murthy adfb830a2b Preparing to release hadoop-2.6.0: Set version in branch-2 to 2.7.0-SNAPSHOT. 2014-11-09 19:19:02 -08:00
Aaron T. Myers 9082fe4e20 HADOOP-10714. AmazonS3Client.deleteObjects() need to be limited to 1000 entries per call. Contributed by Juan Yu.
(cherry picked from commit 6ba52d88ec)
2014-11-05 17:24:55 -08:00
Zhijie Shen e286ae90b7 HADOOP-11241. Fixed intermittent TestNMSimulator failure due to timing issue. Contributed by Varun Vasudev.
(cherry picked from commit 260ab6d5f4)
2014-10-31 18:04:05 -07:00
Haohui Mai 5e5585a7e0 HADOOP-11253. Hadoop streaming test TestStreamXmlMultipleRecords fails on Windows. Contributed by Varun Vasudev. 2014-10-31 11:54:18 -07:00
Kihwal Lee 45b6dea95f MAPREDUCE-6022. map_input_file is missing from streaming job
environment. Contributed by Jason Lowe.
(cherry picked from commit b056048114)
2014-10-29 12:30:08 -05:00
Jian He 9b973b7c83 MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent. Contributed by Junping Du
Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
2014-10-22 10:57:32 -07:00
Vinod Kumar Vavilapalli e8e3a36213 YARN-2496. Enhanced Capacity Scheduler to have basic support for allocating resources based on node-labels. Contributed by Wangda Tan.
YARN-2500. Ehnaced ResourceManager to support schedulers allocating resources based on node-labels. Contributed by Wangda Tan.

(cherry picked from commit f2ea555ac6)
2014-10-15 18:34:19 -07:00
Kihwal Lee 8cf5f9eede Fix version in the pom.xml from HADOOP-11007 for branch-2. 2014-10-07 16:42:35 -05:00
Kihwal Lee 318f0e1e0c Missing files from the previous commit of HADOOP-11007 2014-10-07 16:32:17 -05:00
Kihwal Lee 7910c6d035 HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be)
2014-10-07 16:23:52 -05:00
Allen Wittenauer 27f9edceed HADOOP-10954. Adding site documents of hadoop-tools (Masatake Iwasaki via aw) 2014-09-26 12:01:41 -07:00
Andrew Wang 0eaa4ba026 HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu.
(cherry picked from commit 4ea77efa3a)
2014-09-25 21:56:35 -07:00
Allen Wittenauer afde00a0f5 MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) 2014-09-25 11:28:50 -07:00
Allen Wittenauer ea1fb1461a HADOOP-11009. Add Timestamp Preservation to DistCp (Gary Steelman via aw) 2014-09-24 15:39:55 -07:00
Allen Wittenauer 0037b8f67b YARN-2460. Remove obsolete entries from yarn-default.xml (Ray Chiang via aw) 2014-09-19 14:08:04 -07:00
Allen Wittenauer 5f6129feb4 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) 2014-09-19 11:32:00 -07:00
Colin Patrick Mccabe f80b10e1e7 HADOOP-11091. Eliminate old configuration parameter names from s3a (dsw via cmccabe)
(cherry picked from commit 0ac760a58d)
2014-09-15 16:50:10 -07:00
Aaron T. Myers a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
Colin Patrick Mccabe 5e4cb3d04c HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe)
(cherry picked from commit 5ec7fcd9dd)
2014-09-11 15:00:47 -07:00
Steve Loughran fb804ed46c HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
(cherry picked from commit 59384dfb71)
2014-09-11 11:43:52 -07:00
Karthik Kambatla fe9d1ee96f YARN-2526. SLS can deadlock when all the threads are taken by AMSimulators. (Wei Yan via kasha)
(cherry picked from commit 28d99db992)
2014-09-09 15:15:42 -07:00
Jian He 38853c97c2 YARN-1506. Changed RMNode/SchedulerNode to update resource with event notification. Contributed by Junping Du
(cherry picked from commit 5c14bc426b)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
2014-08-29 23:39:58 -07:00
Andrew Wang 075bb9e380 HADOOP-11021. Configurable replication factor in the hadoop archive command. Contributed by Zhe Zhang.
(cherry picked from commit ea1c6f31c2)
2014-08-29 14:47:28 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Sanford Ryza 53da85efaf MAPREDUCE-5130. Add missing job config options to mapred-default.xml (Ray Chiang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619631 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 23:54:38 +00:00
Zhijie Shen 400f6131d4 YARN-2249. Avoided AM release requests being lost on work preserving RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1618972 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618973 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 20:40:37 +00:00
Allen Wittenauer c828a23d52 HADOOP-10121. Fix javadoc spelling for HadoopArchives#writeTopLevelDirs (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618045 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 20:30:34 +00:00
Colin McCabe 0e37868f7e HADOOP-10843. TestGridmixRecord unit tests failure on PowerPC (Jinghui Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617861 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 01:36:35 +00:00
Karthik Kambatla d0c3ca05de YARN-2399. FairScheduler: Merge AppSchedulable and FSSchedulerApp into FSAppAttempt. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 23:04:06 +00:00
Steve Loughran 5a056789ad HADOOP-10931 compile error on tools/hadoop-openstack
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616481 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 12:35:21 +00:00
Karthik Kambatla c2b0f62155 YARN-1726. ResourceSchedulerWrapper broken due to AbstractYarnScheduler. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613550 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 01:55:03 +00:00
Karthik Kambatla 913833abaf YARN-2335. Annotate all hadoop-sls APIs as @Private. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613480 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 17:33:42 +00:00
Andrew Wang 59c91b22d7 MAPREDUCE-5971. Move the default options for distcp -p to DistCpOptionSwitch. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611218 13f79535-47bb-0310-9956-ffa450edef68
2014-07-16 23:43:00 +00:00
Steve Loughran e87785aea4 HADOOP-9361: Strictly define FileSystem APIs - OpenStack portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607625 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 12:55:23 +00:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:11:57 +00:00
Andrew Wang a18dce22b9 HADOOP-10666. Remove Copyright /d/d/d/d Apache Software Foundation from the source files license header. Contributed by Henry Saputra.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603026 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 23:27:03 +00:00
Uma Maheswara Rao G 2f25a4f3a4 Merged from trunk to branch-2. MAPREDUCE-5898. distcp to support preserving HDFS extended attributes(XAttrs). Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602116 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 10:59:28 +00:00
Vinod Kumar Vavilapalli 71028526c1 MAPREDUCE-5834. Increased test-timeouts in TestGridMixClasses to avoid occassional failures. Contributed by Mit Desai.
svn merge --ignore-ancestry -c 1601764 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601765 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 20:25:22 +00:00
Steve Loughran d7f5d6795c HADOOP-10647. String Format Exception in SwiftNativeFileSystemStore.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600970 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 17:59:37 +00:00
Karthik Kambatla cb3dbb4880 YARN-1474. Make sechedulers services. (Tsuyoshi Ozawa via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599025 13f79535-47bb-0310-9956-ffa450edef68
2014-06-01 19:11:23 +00:00
Chris Nauroth 7895ecccac HADOOP-10602. Merging change r1598337 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 17:33:10 +00:00
Jing Zhao 50acb4032f MAPREDUCE-5899. Merge change r1596931 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596937 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 18:50:20 +00:00
Vinod Kumar Vavilapalli 38b14291e9 YARN-2017. Merged some of the common scheduler code. Contributed by Jian He.
svn merge --ignore-ancestry -c 1596753 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596754 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 05:33:00 +00:00
Jason Darrell Lowe b6988521f4 Reverted HADOOP-10474 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596048 13f79535-47bb-0310-9956-ffa450edef68
2014-05-19 20:31:40 +00:00
Jason Darrell Lowe fb22c7c52f Reverting HADOOP-10485 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596041 13f79535-47bb-0310-9956-ffa450edef68
2014-05-19 20:13:14 +00:00
Chris Nauroth d20f565b4c MAPREDUCE-5809. Merging change r1595283 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595290 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 18:32:15 +00:00
Tsz-wo Sze 6b7d074a54 svn merge -c 1592703 from trunk for MAPREDUCE-5402. In DynamicInputFormat, change MAX_CHUNKS_TOLERABLE, MAX_CHUNKS_IDEAL, MIN_RECORDS_PER_CHUNK and SPLIT_RATIO to be configurable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592704 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 10:25:10 +00:00
Jonathan Turner Eagles e0cd544a53 MAPREDUCE-5639. Port DistCp2 document to trunk (Akira AJISAKA via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590131 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 20:32:09 +00:00
Ravi Prakash 10510bf324 MAPREDUCE-5846. Rumen doesn't understand JobQueueChangedEvent (Nathan Roberts via raviprak)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589597 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 06:05:31 +00:00
Chris Nauroth f0d3664d83 MAPREDUCE-5852. Merging change r1589006 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589007 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:49:28 +00:00
Chris Nauroth de1f0bf3e4 YARN-1970. Merging change r1589001 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589004 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:39:16 +00:00
Haohui Mai 11a6feb8d3 HADOOP-10485. Merge r1586059 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586060 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 18:12:17 +00:00
Steve Loughran 770aef5053 HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 11:11:31 +00:00
Haohui Mai 56268ffc41 HADOOP-10474. Merge r1585886 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585887 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 04:10:23 +00:00
Aaron Myers c5b5947777 HADOOP-10459. distcp V2 doesn't preserve root dir's attributes when -p is specified. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584233 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 00:56:12 +00:00
Aaron Myers 71a7f2b72b MAPREDUCE-5014. Extending DistCp through a custom CopyListing is not possible. (Contributed by Srikanth Sundarrajan)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584232 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 00:49:52 +00:00
Vinod Kumar Vavilapalli 8753d10405 MAPREDUCE-5810. Removed the faulty and failing streaming test TestStreamingTaskLog. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1582896 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582897 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 22:17:44 +00:00
Jing Zhao d611f42c37 Merge r1578669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578676 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 00:10:22 +00:00
Jonathan Turner Eagles 50c410546b MAPREDUCE-5765. Update hadoop-pipes examples README (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577203 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 15:35: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
Sanford Ryza 673ba4c00e YARN-1504. RM changes for moving apps between queues (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567482 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:16:05 +00:00
Alejandro Abdelnur d58cd5d2d0 HADOOP-10311. Cleanup vendor names from the code base. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563240 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 20:12:11 +00:00
Jing Zhao c21e39b79b HADOOP-10295. Merge change r1563019 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563020 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 23:58:56 +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
Vinod Kumar Vavilapalli 76fc12eadf YARN-1490. Introduced the ability to make ResourceManager optionally not kill all containers when an ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557143 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557144 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 15:05:18 +00:00
Vinod Kumar Vavilapalli 8e135fc73c YARN-1493. Changed ResourceManager and Scheduler interfacing to recognize app-attempts separately from apps. Contributed by Jian He.
svn merge --ignore-ancestry -c 1554896 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554898 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 20:21:03 +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
Jian He fc89b2518a Fixed compilation failure caused by r1550618.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550815 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 19:19:40 +00:00
Sanford Ryza cee74196c2 YARN-807. When querying apps by queue, iterating over all apps is inefficient and limiting (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548985 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 03:14:43 +00:00
Daryn Sharp 92fc940ea8 svn merge -c 1548175 FIXES: HADOOP-10129. Distcp may succeed when it fails (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548176 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 15:51:28 +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 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
Steve Loughran a7bfe3efe3 MAPREDUCE-6524 Move grizzly-test and junit dependencies to test scope
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541699 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:43:04 +00:00
Jason Darrell Lowe 55a9d7dc50 svn merge -c 1541566 FIXES: MAPREDUCE-5610. TestSleepJob fails in jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541583 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 16:19:21 +00:00
Luke Lu 9b1122e0eb YARN-311. RM/scheduler support for dynamic resource configuration. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539132 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 21:20:05 +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
Sanford Ryza ba85796267 YARN-786. Expose application resource usage in RM REST API (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537811 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 03:03:24 +00:00
Sanford Ryza 6902aea705 YARN-1306. Clean up hadoop-sls sample-conf according to YARN-1228 (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536990 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 06:57:41 +00:00
Arpit Agarwal 57bdb564c7 HDFS-5436. Merging change r1536921 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536922 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:50:24 +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
Sanford Ryza 5c20de6ac3 MAPREDUCE-5457. Add a KeyOnlyTextOutputReader to enable streaming to write out text files without separators (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533626 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 20:46:05 +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
Jonathan Turner Eagles f35f88b1cf MAPREDUCE-5586. TestCopyMapper#testCopyFailOnBlockSizeDifference fails when run from hadoop-tools/hadoop-distcp directory (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532890 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:28:13 +00:00
Jonathan Turner Eagles 85b5e96f10 MAPREDUCE-5585. TestCopyCommitter#testNoCommitAction Fails on JDK7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532878 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:06:53 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +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
Sanford Ryza f3e4452e31 YARN-1300. SLS tests fail because conf puts YARN properties in fair-scheduler.xml (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:28:41 +00:00
Jonathan Turner Eagles 8a93fa55b6 YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529008 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:18 +00:00
Vinod Kumar Vavilapalli 579cf8f612 YARN-899. Added back queue level administrator-acls so that there is no regression w.r.t 1.x. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1527282 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527283 13f79535-47bb-0310-9956-ffa450edef68
2013-09-29 08:22:14 +00:00
Steve Loughran f5ecb84344 HADOOP-8545 findbugs patches from the final -037 patch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527188 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:57:27 +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
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
Arun Murthy b063da7b50 HADOOP-8545. Fixed merge to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527052 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:54:55 +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
Jason Darrell Lowe 4cd5cb862c svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7. Contributed by Robert Parker
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509901 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 22:53:52 +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
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
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
Daryn Sharp 45ca24c1d8 svn merge -c 1491914 FIXES: MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491918 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 19:30:44 +00:00
Luke Lu d77a2579f2 HADOOP-9616. Fix branch-2 javadoc warnings. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489951 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 16:49:04 +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
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 02:36:44 +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
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
Suresh Srinivas 91084635f3 MAPREDUCE-4885. Merge r1467158 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 07:12:07 +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
Alejandro Abdelnur c56c50df3f MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480754 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 20:11:33 +00:00
Kihwal Lee 88086534a8 svn merge -c 1468629 Merging from trunk to branch-2 to fix MR-5065.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468631 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 22:03:40 +00:00
Alejandro Abdelnur 5b63830211 MAPREDUCE-5098. Fix findbugs warnings in gridmix. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466872 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 13:08:55 +00:00
Alejandro Abdelnur a7d2d7cfc7 MAPREDUCE-5113. Streaming input/output types are ignored with java mapper/reducer. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466870 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 13:04:29 +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
Arun Murthy b66abebca2 Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465189 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 05:33:41 +00:00
Thomas Graves e9e576409c MAPREDUCE-4991. coverage for gridmix (Aleksey Gorshkov via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463808 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 01:47:31 +00:00
Thomas White b1c781b2be MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 11:42:32 +00:00
Thomas Graves 0f66ba0b50 MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and sortFinished times when needed. (Ravi Gummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461296 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 20:10:04 +00:00
Thomas Graves 257b263802 MAPREDUCE-4149. [Rumen] Rumen fails to parse certain counter strings. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461289 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:54:51 +00:00
Thomas Graves 922c8ff997 MAPREDUCE-4356. [Rumen] Provide access to the method ParsedTask.obtainTaskAttempts(). (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461277 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:26:36 +00:00
Thomas Graves 291a20960b MAPREDUCE-4100. [Gridmix] Bug fixed in compression emulation feature for map only jobs. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461275 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:21:43 +00:00
Thomas Graves 8f43934e99 MAPREDUCE-4083. [Gridmix] NPE in cpu emulation. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461272 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:08:26 +00:00
Thomas Graves e9440d688e MAPREDUCE-3008. Improvements to cumulative CPU emulation for short running tasks in Gridmix. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461269 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 19:00:53 +00:00
Siddharth Seth 6e9e2f0c7f MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:18:44 +00:00
Thomas Graves 57f91f9541 MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can become slow in some cases (ravigummadi via tgraves).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461243 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:00:30 +00:00
Thomas Graves 288393399a MAPREDUCE-3953. [Gridmix] Gridmix throws NPE and does not simulate a job if the trace contains null taskStatus for a task. (ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461242 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:52:40 +00:00
Thomas Graves 67b93ebb23 MAPREDUCE-2722. [Gridmix] Gridmix simulated job's map's hdfsBytesRead counter is wrong when compressed input is used.(ravigummadi via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461236 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:42:29 +00:00
Thomas Graves 1f988b777c MAPREDUCE-3829. [Gridmix] Gridmix should give better error message when input data directory already exists and -generate opton is erate opton is
+    given.(ravi

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461233 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 17:29:26 +00:00
Thomas Graves 9a217a56dc MAPREDUCE-3787. [Gridmix] Optimize job monitoring and STRESS mode for faster job submission. (amarrk via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461212 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:35:58 +00:00
Thomas Graves 603eff7e8b HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken. (Andrew Wang via atm)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461205 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 16:27:25 +00:00
Tsz-wo Sze 84664ccde2 svn merge -c 1458741 from trunk for MAPREDUCE-5075. DistCp leaks input file handles since ThrottledInputStream does not close the wrapped InputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458747 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:43:21 +00:00
Alejandro Abdelnur b0c23b2c27 HADOOP-9230. TestUniformSizeInputFormat fails intermittently. (kkambatl via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451292 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 18:52:24 +00:00
Siddharth Seth b775d49f35 merge MAPREDUCE-4693 from trunk. Historyserver should include counters for failed tasks. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450957 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 21:04:29 +00:00
Aaron Myers dcc8325c12 HADOOP-8569. CMakeLists.txt: define _GNU_SOURCE and _LARGEFILE_SOURCE. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449923 13f79535-47bb-0310-9956-ffa450edef68
2013-02-25 22:08:33 +00:00
Alejandro Abdelnur 67aaee865f HADOOP-9297. remove old record IO generation and tests. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446045 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:28:46 +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
Aaron Myers 98678962c4 MAPREDUCE-4953. HadoopPipes misuses fprintf. Contributed by Andy Isaacson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442472 13f79535-47bb-0310-9956-ffa450edef68
2013-02-05 04:54:28 +00:00
Robert Joseph Evans 54ce586b8d svn merge -c r1427945 FIXES: MAPREDUCE-4884. Streaming tests fail to start MiniMRCluster due to missing queue configuration. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442174 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 16:54:43 +00:00
Siddharth Seth 6f146b15d3 merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 00:23:27 +00:00
Todd Lipcon f596c9b629 HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434531 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 01:37:45 +00:00
Thomas Graves 2fa1932e9d HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432942 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:02:21 +00:00
Jason Darrell Lowe 41ad080fd9 svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when using both -files and -file to hadoop streaming. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425181 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 23:12:44 +00:00
Thomas Graves 38750e6500 MAPREDUCE-4895 Fix compilation failure of org.apache.hadoop.mapred.gridmix.TestResourceUsageEmulators (Dennis Y via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424501 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 14:52:24 +00:00
Robert Joseph Evans de89166116 svn merge -c 1414239 FIXES: YARN-204. test coverage for org.apache.hadoop.tools (Aleksey Gorshkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414241 13f79535-47bb-0310-9956-ffa450edef68
2012-11-27 16:06:57 +00:00
Jason Darrell Lowe 57657df4dc svn merge -c 1408604 FIXES: HADOOP-9025. org.apache.hadoop.tools.TestCopyListing failing. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408605 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 05:55:51 +00:00
Robert Joseph Evans 877b8200df svn merge -c 1408488 FIXES: HADOOP-9022. Hadoop distcp tool fails to copy file if -m 0 specified (Jonathan Eagles vai bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408491 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 22:47:05 +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
Thomas White 4a63906756 Merge -r 1396046:1396047 from trunk to branch-2. Fixes: MAPREDUCE-4654. TestDistCp is ignored. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396051 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 14:49:51 +00:00
Eli Collins c2f9f968f9 HADOOP-8789. Tests setLevel(Level.OFF) should be Level.ERROR. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383497 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 17:58:07 +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
Aaron Myers ee6d9ff79d HADOOP-8775. MR2 distcp permits non-positive value to -bandwidth option which causes job never to complete. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382121 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 18:41:28 +00:00
Eli Collins 6628e4f726 HADOOP-8431. Running distcp wo args throws IllegalArgumentException. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381841 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 01:27:15 +00:00
Todd Lipcon 0c5de0e4f6 HDFS-3054. distcp -skipcrccheck has no effect. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381295 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 18:54:32 +00:00
Robert Joseph Evans bc5f02bac0 svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 18:07:59 +00:00
Robert Joseph Evans e26c63b238 svn emrge -c 1373599. FIXES: HADOOP-8703
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373600 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 19:51:16 +00:00
Robert Joseph Evans 00712ab983 svn merge -c 1373581 FIXES: HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave Thompson via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373585 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 19:17:32 +00:00
Todd Lipcon ced2087998 HADOOP-8659. Native libraries must build with soft-float ABI for Oracle JVM on ARM. Contributed by Trevor Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371508 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 21:58:29 +00:00
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:21:27 +00:00
Eli Collins 0929846101 HADOOP-8547. Package hadoop-pipes examples/bin directory (again). Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356948 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 21:13:02 +00:00
Eli Collins 2b938bea99 HADOOP-8538. CMake builds fail on ARM. Contributed by Trevor Robinson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356042 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 22:51:13 +00:00
Eli Collins 4a5591ebe1 MAPREDUCE-4383. HadoopPipes.cc needs to include unistd.h. Contributed by Andy Isaacson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355557 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 21:02:29 +00:00
Thomas Graves 2d734774a1 merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352551 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 15:02:16 +00:00
Siddharth Seth 27bbcc4c5c Merge MAPREDUCE-4270 from trunk. Move the data_join test classes to the correct path. (Contributed by Thomas Graves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351870 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 21:54:00 +00:00
Robert Joseph Evans c30a4d6a90 svn merge -c 1351818. FIXESL MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351825 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 20:00:35 +00:00
Robert Joseph Evans f376251475 svn merge -c 1344763 FIXES: MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344764 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 15:17:39 +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 1c65990dae merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 01:57:21 +00:00
Eli Collins 8f1f57b37e HADOOP-8329. Build fails with Java 7. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340269 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:45:42 +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 09c2172681 svn merge -c 1335505 FIXES: HADOOP-8341. Fix or filter findbugs issues in hadoop-tools (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335506 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 13:22:43 +00:00
Robert Joseph Evans 7602ae886f svn merge -c 1335075 FIXES: HADOOP-8327. distcpv2 and distcpv1 jars should not coexist (Dave Thompson via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335078 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 15:50:55 +00:00
Alejandro Abdelnur 9a04fc6caf Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:21:15 +00:00
Robert Joseph Evans 0581c7e598 svn merge -c 1331440. FIXES: HADOOP-8305. distcp over viewfs is broken (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331441 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 14:41:38 +00:00
Alejandro Abdelnur 479e5b0102 Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:34:49 +00:00
Robert Joseph Evans ebb3792a6a svn merge -c 1328018 from trunk. FIXES: HADOOP-8288. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328021 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:11:58 +00:00
Robert Joseph Evans 8ca897dea2 svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
Robert Joseph Evans 954327f770 svn merge -c 1309453 from trunk FIXES: MAPREDUCE-3082. Archive command take wrong path for input file with current directory (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309454 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:30:03 +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
Robert Joseph Evans 73bcd8da8a svn merge -c 1297274 from trunk to branch-0.23 FIXES HADOOP-8064. Remove unnecessary dependency on w3c.org in document processing (Khiwal Lee via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297275 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 23:10:01 +00:00
Robert Joseph Evans fba95910c5 svn merge -c 1294743 trunk to branch-0.23 FIXES MAPREDUCE-3790 Broken pipe on streaming job can lead to truncated output for a successful job (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294747 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 17:45:40 +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
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
Amar Kamat df16466878 MAPREDUCE-3770. Zombie.getJobConf() results into NPE. (amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241865 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 11:08:21 +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
Arun Murthy 3d61db4cc4 Merge -c 1239391 from trunk to branch-0.23 to fix MAPREDUCE-3427. Fix streaming unit tests broken after mavenization.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239392 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:05:54 +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 c9a5c42efd MAPREDUCE-3733. Add Apache License Header to hadoop-distcp/pom.xml. (mahadev) - Merging r1236066 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236068 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 08:31:54 +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
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
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
Arun Murthy 0e4f690197 Merge -c 1225471 from trunk to branch-0.23 to fix MAPREDUCE-3521.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225472 13f79535-47bb-0310-9956-ffa450edef68
2011-12-29 08:24:41 +00:00
Arun Murthy fc62f00ffc Merge -c 1225259 from trunk to branch-0.23 to fix MAPREDUCE-3604.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1225261 13f79535-47bb-0310-9956-ffa450edef68
2011-12-28 18:25:13 +00:00
Alejandro Abdelnur 771a5e7dce Merge -r 1213907:1213908 and 1213910:1213911 from trunk to branch. FIXES: HADOOP-7810
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213915 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:29:06 +00:00
Mahadev Konar 3610bc8c4c MAPREDUCE-3488. Streaming jobs are failing because the main class isnt set in the pom files. (mahadev) - Merging r1208796 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208798 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 21:22:20 +00:00
Thomas White c4b13d74e5 Merge -r 1207754:1207755 from trunk to branch-0.23. Fixes: MAPREDUCE-3433
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207756 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 05:12:07 +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
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
Alejandro Abdelnur fa989c88fc Merge -r 1179911:1179912 from trunk to branch. FIXES: HADOOP-7624
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190581 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:14:36 +00:00