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

1718 Commits

Author SHA1 Message Date
Haohui Mai 72f8755cca HDFS-5685. Merge r1590100 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590104 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 19:02:34 +00:00
Haohui Mai 038f32f74e HDFS-6210. Merge r1589933 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589934 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 05:56:51 +00:00
Jing Zhao e91f6f809b HDFS-6266. Merge r1589920 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589921 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 02:07:25 +00:00
Aaron Myers 0bf1e43ac3 HDFS-6281. Provide option to use the NFS Gateway without having to use the Hadoop portmapper. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589915 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 00:19:34 +00:00
Colin McCabe 0e2a0fb434 HDFS-6282. Re-add testIncludeByRegistrationName (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589908 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 23:09:04 +00:00
Arpit Agarwal 6ec6fde017 HDFS-6273: Merging r1589803 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589805 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 17:41:05 +00:00
Jing Zhao a9ab3fe0f6 HDFS-5693. Merge r1589620 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589621 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 07:26:35 +00:00
Haohui Mai d49ff92928 HDFS-6279. Merge r1589618 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589619 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 07:20:46 +00:00
Haohui Mai 4ef2598d5d HDFS-6278. Merge r1589613 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589616 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 07:17:17 +00:00
Suresh Srinivas 32e76decb5 HDFS-6276. Merge r1589586 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589588 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 05:08:14 +00:00
Kihwal Lee 8bcb8dba51 svn merge -c 1589528 merging from trunk to branch-2 to fix:HDFS-6217. Webhdfs PUT operations may not work via a http proxy. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589529 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 22:08:19 +00:00
Suresh Srinivas 488a4086ae HDFS-6275. Merge r1589510 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589511 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 20:21:59 +00:00
Suresh Srinivas a27fda9c85 HDFS-6274. Merge r1589506 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589507 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 20:16:16 +00:00
Andrew Wang db667639eb HDFS-5213. TestDataNodeConfig failing on Jenkins runs due to DN web port in use. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589477 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 18:09:34 +00:00
Jing Zhao a6e2b23b9d HDFS-6178. Merge r1589002 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589003 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 23:37:58 +00:00
Chris Nauroth f3a6e7023b HDFS-6265. Merging change r1588995 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588998 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 22:55:42 +00:00
Arpit Agarwal ba0c72d010 HDFS-6245: Merging r1588842 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588843 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 00:16:20 +00:00
Haohui Mai 8d12e9bf81 HDFS-6256. Merge r1588524 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588526 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-18 17:37:26 +00:00
Vinayakumar B 641cbc0feb Merge r1588258 from trunk, HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588262 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-17 14:07:42 +00:00
Colin McCabe d28e711956 HDFS-4909. Avoid protocol buffer RPC namespace clashes (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588093 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 23:01:16 +00:00
Kihwal Lee 4a13429dce svn merge -c 1587962 from trunk to branch-2 to fix:HDFS-6219. Proxy superuser configuration should use true client IP for address checks. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587964 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 16:26:07 +00:00
Daryn Sharp 46738ee92b svn merge -c 1587954 FIXES: HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587955 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 16:06:28 +00:00
Chris Nauroth c3c195e9e8 HDFS-5409. Merging change r1587759 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587760 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 00:12:53 +00:00
Haohui Mai d7583e206d HDFS-6194. Merge r1587660 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587665 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-15 18:15:36 +00:00
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 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 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
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
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
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 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
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
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
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
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
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
Haohui Mai 09c38c24e0 HDFS-6169. Merge r1585802 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585804 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-08 18:15:52 +00:00
Haohui Mai 02beaa7b18 HDFS-6143. Merge r1585639 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585641 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-08 01:45:21 +00:00
Chris Nauroth 4b31af597b HDFS-6198. Merging change r1585627 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585628 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-08 00:06:59 +00:00
Haohui Mai 1b2a9412f8 HDFS-6180. Merge r1585625 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585626 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-07 23:58:24 +00:00
Chris Nauroth 58d9479140 HDFS-6197. Merging change r1585586 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585591 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-07 21:26:42 +00:00
Brandon Li 45e26bae05 HDFS-6181. Merging change r1585563 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585581 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-07 20:40:01 +00:00
Kihwal Lee fef85fad1a svn merge -c 1585544 Merging from trunk to branch-2 to fix:HDFS-6191. Disable quota checks when replaying edit log. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585545 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-07 18:27:03 +00:00