Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,615 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

304 Commits

Author SHA1 Message Date
Akira Ajisaka e97613b429 HADOOP-11480. Typo in hadoop-aws/index.md uses wrong scheme for test.fs.s3.name. Contributed by Ted Yu. 
(cherry picked from commit 1a625b8158)
 2015-02-24 17:13:35 -08:00
Steve Loughran a36cad0522 HADOOP-11584 s3a file block size set to 0 in getFileStatus. (Brahma Reddy Battula via stevel) 2015-02-21 12:02:41 +00:00
Steve Loughran 4276f8b315 HADOOP-11607. Reduce log spew in S3AFileSystem. (Lei (Eddy) Xu via stevel) 2015-02-20 20:51:00 +00:00
Steve Loughran 411c8a7cda HADOOP-11521. Make connection timeout configurable in s3a. (Thomas Demoor via stevel) 2015-02-17 20:00:00 +00:00
Steve Loughran f52fcdc2e0 HADOOP-11522. Update S3A Documentation. (Thomas Demoor via stevel) 2015-02-17 18:14:31 +00:00
Steve Loughran 701b96ca8e HADOOP-11570. S3AInputStream.close() downloads the remaining bytes of the object from S3. (Dan Hecht via stevel). 2015-02-17 16:36:32 +00:00
Steve Loughran af7368cf03 HADOOP-11520. Clean incomplete multi-part uploads in S3A tests. (Thomas Demoor via stevel) 2015-02-06 20:59:56 +00:00
Steve Loughran 4cd9657b71 HADOOP-11463 Replace method-local TransferManager object with S3AFileSystem#transfers. (Ted Yu via stevel) 2015-02-05 12:19:49 +00:00
Akira Ajisaka 0a030871dd MAPREDUCE-6243. Fix findbugs warnings in hadoop-rumen. Contributed by Masatake Iwasaki. 
(cherry picked from commit 34fe11c987)
 2015-02-04 09:27:01 -08:00
Tsuyoshi Ozawa f92d4fa20f HADOOP-11546. Checkstyle failing: Unable to instantiate DoubleCheckedLockingCheck. (ozawa) 
(cherry picked from commit ba58da29f4)
 2015-02-05 00:51:40 +09:00
Akira Ajisaka 8d98e5c960 MAPREDUCE-5800. Use Job#getInstance instead of deprecated constructors. (aajisaka) 
(cherry picked from commit bd69fb2d44)

Conflicts:
	hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java
 2015-02-03 14:35:15 -08:00
Karthik Kambatla c981b040ba YARN-1393. SLS: Add how-to-use instructions. (Wei Yan via kasha) 
(cherry picked from commit c559df2219)
 2015-02-03 13:20:57 -08:00
Haohui Mai 6c5ae1571c HADOOP-11529. Fix findbugs warnings in hadoop-archives. Contributed by Masatake Iwasaki. 2015-02-03 10:53:26 -08:00
cnauroth dedfb982f1 HADOOP-11442. hadoop-azure: Create test jar. Contributed by Shashank Khandelwal. 
(cherry picked from commit 1c09ca2ba4)
 2015-02-02 11:51:01 -08:00
Harsh J 648510e031 HADOOP-11488. Difference in default connection timeout for S3A FS. Contributed by Daisuke Kobayashi. 
(cherry picked from commit ffc75d6ebe)
 2015-02-01 00:17:24 +05:30
Allen Wittenauer a754f94ed7 MAPREDUCE-6151. Update document of GridMix (Masatake Iwasaki via aw) 2015-01-30 11:09:03 -08:00
cnauroth 4607ca2854 HADOOP-11523. StorageException complaining " no lease ID" when updating FolderLastModifiedTime in WASB. Contributed by Duo Xu. 
(cherry picked from commit f2c91098c4)
 2015-01-29 17:02:48 -08:00
Allen Wittenauer 3165e778f3 MAPREDUCE-6150. Update document of Rumen (Masatake Iwasaki via aw) 2015-01-29 14:18:25 -08:00
cnauroth fa2378d866 HADOOP-11441. Hadoop-azure: Change few methods scope to public. Contributed by Shashank Khandelwal. 
(cherry picked from commit ad55083f75)
 2015-01-29 13:07:59 -08:00
Allen Wittenauer 874e38d81f HDFS-7566. Remove obsolete entries from hdfs-default.xml (Ray Chiang via aw) 2015-01-27 14:32:21 -08:00
Tsuyoshi Ozawa 2551cc6e6f HADOOP-11450. Cleanup DistCpV1 not to use deprecated methods and fix javadocs. Contributed by Varun Saxena. 
(cherry picked from commit 7b82c4ab4e)
 2015-01-26 13:02:00 +09:00
Allen Wittenauer 683cc18bba HADOOP-11256. Some site docs have inconsistent appearance (Masatake Iwasaki via aw) 2015-01-21 08:46:19 -08:00
Steve Loughran 15865587ec HADOOP-11171 Enable using a proxy server to connect to S3a. (Thomas Demoor via stevel) 2015-01-17 18:40:30 +00:00
Steve Loughran ed2f8a1ba0 HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore retrieveBlock(). (Ted Yu via stevel) 2015-01-17 18:26:03 +00:00
Steve Loughran 651c7debe4 HADOOP-11261 Set custom endpoint for S3A. (Thomas Demoor via stevel) 2015-01-16 10:15:22 +00:00
Arpit Agarwal 7a75f4eed9 HADOOP-11465. Fix findbugs warnings in hadoop-gridmix. (Contributed by Varun Saxena) 2015-01-12 21:23:13 -08:00
Steve Loughran 2800e73c27 HADOOP-11446 S3AOutputStream should use shared thread pool to avoid OutOfMemoryError 2015-01-05 12:59:48 +00:00
Karthik Kambatla 798ab51289 YARN-2998. Abstract out scheduler independent PlanFollower components. (Anubhav Dhoot via kasha) 
(cherry picked from commit e7257acd8a)
 2014-12-30 19:55:50 -08:00
Tsuyoshi Ozawa 7739f819a6 HADOOP-11283. SequenceFile.Writer can leak file descriptors in DistCpV1#setup(). (Contributed by Varun Saxena via ozawa) 
(cherry picked from commit a164ce2ac9)
 2014-12-25 23:32:34 +09:00
Jian He 411836b74c YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan 
(cherry picked from commit fdf042dfff)
 2014-12-22 16:52:15 -08:00
Haohui Mai e6662ec6a4 HADOOP-11429. Findbugs warnings in hadoop extras. Contributed by Varun Saxena. 2014-12-21 14:57:41 -08:00
arp 0a5b28605f HADOOP-11395. Add site documentation for Azure Storage FileSystem integration. (Contributed by Chris Nauroth) 2014-12-19 18:54:35 -08:00
Haohui Mai 99c176ea6a HADOOP-11431. Clean up redundant maven-site-plugin configuration. Contributed by Herve Boutemy. 2014-12-18 16:24:17 -08:00
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