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

241 Commits

Author SHA1 Message Date
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