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

6227 Commits

Author SHA1 Message Date
Chris Nauroth 7c89cbfcd2 HDFS-6243. Merging change r1587410 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587416 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-15 04:59:49 +00:00
Chris Nauroth d2bb90033e HADOOP-10500. Merging change r1587361 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587362 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 23:52:21 +00:00
Chris Nauroth f3039d3640 HDFS-6238. Merging change r1587148 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587150 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 04:50:14 +00:00
Chris Nauroth 750664ebc1 HDFS-6237. Merging change r1587146 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587147 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 04:42:23 +00:00
Chris Nauroth e390be170f HADOOP-10496. Merging change r1587141 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587144 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 04:32:31 +00:00
Chris Nauroth 065a09c8fc HADOOP-10495. Merging change r1587137 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587138 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 04:14:57 +00:00
Vinod Kumar Vavilapalli 1134ccdb0d YARN-1928. Fixed a race condition in TestAMRMRPCNodeUpdates which caused it to fail occassionally. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1587114 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587115 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-13 22:40:43 +00:00
Vinod Kumar Vavilapalli 2595a27092 YARN-1933. Fixed test issues with TestAMRestart and TestNodeHealthService. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1587104 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587105 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-13 21:52:09 +00:00
Vinod Kumar Vavilapalli 982ab03fbb MAPREDUCE-5828. Fixed a test issue with TestMapReduceJobControl that was causing it to fail on Windows. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1587089 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587090 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-13 19:55:57 +00:00
Chris Nauroth 3672935a18 HDFS-6236. Merging change r1586902 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586903 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-12 21:46:13 +00:00
Sanford Ryza 755e8c684c YARN-1923. Make Fair Scheduler resource ratio calculations terminate faster (Anubhav Dhoot via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586795 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 23:23:33 +00:00
Colin McCabe 35a5a32f17 HDFS-6232. OfflineEditsViewer throws a NPE on edits containing ACL modifications (ajisakaa via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586791 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 22:43:15 +00:00
Vinod Kumar Vavilapalli 0f6040a27b YARN-1833. Relocating CHANGES.txt entry in trunk and branch-2 to the right location. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586769 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 20:28:27 +00:00
Vinod Kumar Vavilapalli dcabf5ceeb YARN-1907. Merged into branch-2.4 also. 
svn merge --ignore-ancestry -c 1585992 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586767 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 20:23:09 +00:00
Vinod Kumar Vavilapalli 757a2e8249 YARN-1883. Merged into branch-2.4 also. 
svn merge --ignore-ancestry -c 1582862 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586766 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 20:16:10 +00:00
Jing Zhao 4d83618ec6 HDFS-6229. Merge r1586714 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586715 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 16:45:06 +00:00
Chris Nauroth 77beb3573c HDFS-6235. Merging change r1586692 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586696 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 15:49:37 +00:00
Jonathan Turner Eagles fbc9db6954 HADOOP-8826. Docs still refer to 0.20.205 as stable line (Mit Desai via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586687 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 15:38:06 +00:00
Chris Nauroth f44451bd58 HDFS-6234. Merging change r1586682 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586686 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 15:34:34 +00:00
Chris Nauroth dcc01e0ff5 HADOOP-10490. Merging change r1586570 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586572 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 04:45:32 +00:00
Vinod Kumar Vavilapalli b92a4cf472 MAPREDUCE-5826. Fixed HistoryServerFileSystemStore to use right permissions on Windows for temporary files and thus also fix the test-issue with 
TestHistoryServerFileSystemStateStoreService. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1586567 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586568 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 04:29:28 +00:00
Vinod Kumar Vavilapalli 799774859d YARN-1926. Changed DistributedShell to use appIDs as unique identifiers for HDFS paths and thus avoid test failures on Windows. Contributed by Varun Vasudev. 
svn merge --ignore-ancestry -c 1586562 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586564 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 04:07:11 +00:00
Vinod Kumar Vavilapalli 7eff6cc305 MAPREDUCE-5815. Fixed test-failure of TestMRAppMaster by making MRAppMaster gracefully handle empty-queue names. Contributed by Akira Ajisaka. 
svn merge --ignore-ancestry -c 1586559 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586560 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 04:02:19 +00:00
Chris Nauroth cb9c1d3c7b HDFS-6231. Merging change r1586551 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586553 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 03:58:40 +00:00
Zhijie Shen befba101f3 YARN-1924. Made ZKRMStateStore updateApplication(Attempt)StateInternal work when Application(Attempt) state hasn't been stored before. Contributed by Jian He. 
svn merge --ignore-ancestry -c 1586547 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586548 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 03:38:27 +00:00
Jian He 9df6ddd282 Merge r1586522 from trunk. YARN-1903. Set exit code and diagnostics when container is killed at NEW/LOCALIZING state. Contributed by Zhijie Shen 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586523 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 01:28:22 +00:00
Andrew Wang 3ed7d84136 Undo accidental FSNamesystem change introduced in HDFS-6224 commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586516 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 00:23:25 +00:00
Andrew Wang b4989ed791 HDFS-6224. Add a unit test to TestAuditLogger for file permissions passed to logAuditEvent. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586494 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 22:36:36 +00:00
Jason Darrell Lowe 58aefafe76 svn merge -c 1586479 FIXES: MAPREDUCE-5825. Provide diagnostics for reducers killed during ramp down. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586482 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 22:09:16 +00:00
Vinayakumar B a495fdb86f Merge HADOOP-10350. BUILDING.txt should mention openssl dependency required for hadoop-pipes (Vinayakumar B) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586443 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 19:34:36 +00:00
Vinod Kumar Vavilapalli 51a39fdbb9 YARN-1914. Fixed resource-download on NodeManagers to skip permission verification of public cache files in Windows+local file-system environment. Contribued by Varun Vasudev. 
svn merge --ignore-ancestry -c 1586434 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586435 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 19:28:56 +00:00
Zhijie Shen 874b4979d0 YARN-1920. Fixed TestFileSystemApplicationHistoryStore failure on windows. Contributed by Vinod Kumar Vavilapalli. 
svn merge --ignore-ancestry -c 1586414 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586420 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 18:59:44 +00:00
Uma Maheswara Rao G 2dea526b23 Merge HDFS-5669. Storage#tryLock() should check for null before logging successfull message. Contributed by Vinayakumar B 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586393 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 18:13:40 +00:00
Vinod Kumar Vavilapalli ec907fef0e MAPREDUCE-5824. Fixed test-failure of TestPipesNonJavaInputFormat in Windows. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1586368 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586369 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 16:44:31 +00:00
Vinod Kumar Vavilapalli 614faccf1d YARN-1910. Fixed a race condition in TestAMRMTokens that causes the test to fail more often on Windows. Contributed by Xuan Gong. 
svn merge --ignore-ancestry -c 1586192 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586193 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 01:37:22 +00:00
Haohui Mai 55758cbd81 HDFS-6225. Merge r1586181 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586182 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 00:22:19 +00:00
Chris Nauroth 129bf91c5e HDFS-6208. Merging change r1586154 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586160 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 21:58:01 +00:00
Haohui Mai 29bdcc24d6 HDFS-6170. Merge r1586152 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586153 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 21:33:28 +00:00
Tsz-wo Sze 02163d1441 svn merge -c 1586079 from trunk for HDFS-6209. TestValidateConfigurationSettings should use random ports. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586080 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 18:50:39 +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
Tsz-wo Sze 56d87fb514 svn merge -c 1586039 from trunk for HDFS-6204. Fix TestRBWBlockInvalidation: change the last sleep to a loop. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586040 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 17:02:12 +00:00
Tsz-wo Sze f23be52c30 svn merge -c 1586034 from trunk for HDFS-6206. Fix NullPointerException in DFSUtil.substituteForWildcardAddress. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586037 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 16:55:48 +00:00
Tsz-wo Sze 29f9ee01ce svn merge -c 1586030 from trunk for HADOOP-10473. TestCallQueueManager should interrupt before counting calls. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586031 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 16:50:25 +00:00
Jonathan Turner Eagles 2c54fd41ef HDFS-6215. Wrong error message for upgrade. (Kihwal Lee via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586013 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 16:25:35 +00:00
Arpit Agarwal 0761ef1951 HDFS-6160: Merging 1586007 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586008 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 16:14:35 +00:00
Kihwal Lee f10bf59e6e svn merge -c 1585992 merging from trunk to branch-2 to fix:YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory intermittently fails. Contributed by Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585993 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 15:35:13 +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
Karthik Kambatla fa3c632fb2 YARN-1784. TestContainerAllocation assumes CapacityScheduler. (Robert Kanter via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585895 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 05:55:11 +00:00
Jing Zhao f84e522ab7 HADOOP-10475. Merge change r1585888 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585889 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 04:57:57 +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