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

2151 Commits

Author SHA1 Message Date
Haohui Mai 3395e01504 HDFS-6580. Merge r1604704 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604705 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-23 07:22:25 +00:00
Vinayakumar B 4e3551eea6 Merged revision(s) 1604692 from hadoop/common/trunk: 
HDFS-6507. Improve DFSAdmin to support HA cluster better. (Contributd by Zesheng Wu)
........

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604695 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-23 05:19:28 +00:00
Haohui Mai dbfde21372 HDFS-6583. Merge r1604541 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604542 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-22 07:41:23 +00:00
Jing Zhao df1ab51d97 HDFS-4667. Merge r1604488 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604489 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 23:01:25 +00:00
Chris Nauroth 4c5d6b5f82 HDFS-6222. Remove background token renewer from webhdfs. Contributed by Rushabh Shah and Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604301 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 23:58:40 +00:00
Haohui Mai 9ba06f53fc HDFS-6557. Merge r1604242 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604244 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 18:56:00 +00:00
Jing Zhao eb7ea60a9a HDFS-6535. Merge r1604226 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604228 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 18:26:50 +00:00
Aaron Myers f4506f5f92 HDFS-6403. Add metrics for log warnings reported by JVM pauses. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604076 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 02:39:36 +00:00
Alejandro Abdelnur de63c98853 HDFS-6312. WebHdfs HA failover is broken on secure clusters. (daryn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604046 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 23:07:09 +00:00
Aaron Myers 16d769c864 HDFS-6549. Add support for accessing the NFS gateway from the AIX NFS client. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604023 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 19:41:24 +00:00
Kihwal Lee 6fdd0698bc svn merge -c 1604011 merging from trunk to branch-2 to fix:HDFS-3848. A Bug in recoverLeaseInternal method of FSNameSystem class. Contributed by Hooman Peiro Sajjad and Chen He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604012 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 19:06:50 +00:00
Andrew Wang 17a6d23967 HDFS-6492. Support create-time xattrs and atomically setting multiple xattrs. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603978 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 17:55:01 +00:00
Aaron Myers b61992e807 HDFS-6563. NameNode cannot save fsimage in certain circumstances when snapshots are in use. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603713 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 05:20:23 +00:00
Haohui Mai f8240cdb87 HDFS-6480. Merge r1603705 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603706 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 04:15:56 +00:00
Brandon Li a817378930 HDFS-6553. Merging change r1603677 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603679 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 23:55:13 +00:00
Arpit Agarwal 12f2f5d1a3 HDFS-6559: Merging r1603638 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603639 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 21:30:11 +00:00
Brandon Li 5e0bc1ee85 HDFS-6439. Merging change r1603622 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603624 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 20:50:05 +00:00
Jing Zhao 6c92704276 HDFS-6551. Merge r1603612 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603615 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 19:58:36 +00:00
Arpit Agarwal f03ad3d756 HDFS-6552: Merging r1603602 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603603 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 19:37:45 +00:00
Tsz-wo Sze 019466b57b svn merge -c 1603571 from trunk for HDFS-6530. Fix Balancer documentation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603572 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 18:45:23 +00:00
Jing Zhao ebe064b9ff HDFS-6527. Merge r1603340 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603341 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 01:02:23 +00:00
Kihwal Lee 97d57ff1f4 svn merge -c 1603239 merging from trunk to branch-2 to fix:HDFS-6545. Finalizing rolling upgrade can make NN unavailable for a long duration. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603241 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 18:00:54 +00:00
Chris Nauroth 51dba744bd HADOOP-10557. Merging change r1603222 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603226 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 17:11:24 +00:00
Andrew Wang 73da7dde47 HDFS-6528. Add XAttrs to TestOfflineImageViewer. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603021 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 23:08:24 +00:00
Andrew Wang 88344f9b06 HDFS-6518. TestCacheDirectives#testExceedsCapacity should take FSN read lock when accessing pendingCached list. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603017 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 22:48:22 +00:00
Colin McCabe a2aebb4b28 HDFS-6539. test_native_mini_dfs is skipped in hadoop-hdfs pom.xml (decstery via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602999 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 20:36:06 +00:00
Arun Murthy 3278b6cc39 Preparing to release hadoop-2.4.1. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602887 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 15:11:14 +00:00
Aaron Myers 8b1abad185 HDFS-6499. Use NativeIO#renameTo instead of File#renameTo in FileJournalManager. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602543 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 02:17:10 +00:00
Aaron Myers 018793faa7 HDFS-6529. Trace logging for RemoteBlockReader2 to identify remote datanode and file being read. Contributed by Anubhav Dhoot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602539 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 00:59:47 +00:00
Andrew Wang 7ce31cc100 HDFS-6470. TestBPOfferService.testBPInitErrorHandling is flaky. Contributed by Ming Ma. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602491 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 19:00:52 +00:00
Haohui Mai 99b18b0019 HDFS-6330. Merge r1602484 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602485 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 18:06:57 +00:00
Andrew Wang 15faf00a8b HADOOP-10691. Improve the readability of 'hadoop fs -help'. Contributed by Lei Xu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602331 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 06:45:06 +00:00
Andrew Wang c5de5f87ea HDFS-3493. Invalidate excess corrupted blocks as long as minimum replication is satisfied. Contributed by Juan Yu and Vinayakumar B. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602293 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 21:17:46 +00:00
Andrew Wang 051049a4f5 HDFS-6395. Skip checking xattr limits for non-user-visible namespaces. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602289 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 20:58:46 +00:00
Andrew Wang 35eeacc122 HDFS-6460. Ignore stale and decommissioned nodes in NetworkTopology#sortByDistance. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602287 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 20:45:52 +00:00
Chris Nauroth 7b1c468b43 HADOOP-10561. Merging change r1602225 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602229 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 16:58:40 +00:00
Uma Maheswara Rao G d59ca5c4e1 Merged from trunk to branch-2. HDFS-6375. Listing extended attributes with the search permission. Contributed by Charles Lamb 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602133 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 12:02:57 +00:00
Uma Maheswara Rao G 5677e994e3 Merge from trunk to branch-2. HDFS-6464. Support multiple xattr.name parameters for WebHDFS getXAttrs. Contributed by Yi Liu 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602125 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 11:22:43 +00:00
Konstantin Boudnik b0d286dddb HDFS-6471. Merge r1602064 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602066 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 05:52:05 +00:00
Arpit Agarwal 8314818b6f HADOOP-10376: Merging r1602055 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602057 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 01:43:01 +00:00
Alejandro Abdelnur cbec85322f HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602042 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 22:40:15 +00:00
Uma Maheswara Rao G 6eb03a41cb Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 19:25:17 +00:00
Haohui Mai 2582dd2ca3 HDFS-6315. Merge r1601960 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601963 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 17:28:12 +00:00
Haohui Mai c6ed9ac1d8 HDFS-6503. Merge r1601958 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601959 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 17:14:35 +00:00
Arpit Agarwal 705c23e718 HDFS-6364: Merging r1601771 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601772 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 21:03:16 +00:00
Andrew Wang f3e1811dbd HDFS-6399. Add note about setfacl in HDFS permissions guide. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601477 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-09 18:43:33 +00:00
Colin McCabe 7b795f6a7c HDFS-6257. TestCacheDirectives#testExceedsCapacity fails occasionally (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601474 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-09 18:40:00 +00:00
Junping Du d678a9ecf9 Merge r1601199 from trunk: HDFS-6500. Snapshot shouldn't be removed silently after renaming to an existing snapshot. (Contributed by Nicholas SZE) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601200 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-08 07:17:46 +00:00
Konstantin Boudnik 3cc1e9fc31 HDFS-6297. Add CLI testcases to reflect new features of dfs and dfsadmin (Contributed by Dasha Boudnik) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601060 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-07 05:23:40 +00:00
Colin McCabe 38c0114f2b HDFS-6497. Make TestAvailableSpaceVolumeChoosingPolicy deterministic (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601036 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 23:41:08 +00:00
Andrew Wang 96defb2d7b HDFS-6487. TestStandbyCheckpoint#testSBNCheckpoints is racy. Contributed by Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601017 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 21:42:40 +00:00
Colin McCabe 10bfa1ef2b HDFS-6369. Document that BlockReader#available() can return more bytes than are remaining in the block (Ted Yu via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600802 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 00:59:44 +00:00
Andrew Wang 2abf0c7bea HDFS-6268. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599842 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-04 00:37:38 +00:00
Andrew Wang bb87b70e37 Revert bad HDFS-6268 commit from branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599807 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 22:06:11 +00:00
Andrew Wang 2088225632 HDFS-6268. Merged from r1599734. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599737 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 18:33:51 +00:00
Jing Zhao b712ed2b23 HDFS-6424. Merge r1599397 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599398 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 00:52:16 +00:00
Michael Stack 78d46e8508 HDFS-6109 let sync_file_range() system call run in background (Liang Xie via stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599351 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-02 20:34:20 +00:00
Kihwal Lee 2655f418b2 Fix merge error. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598874 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-31 14:32:44 +00:00
Brandon Li c1e2673754 HDFS-6056. Merging change r1598782 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598792 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-31 00:26:34 +00:00
Andrew Wang 0214a435a5 HDFS-6472. Merged from r1598746. fix typo in webapps/hdfs/explorer.js. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598747 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 20:44:57 +00:00
Alejandro Abdelnur 2e8259ae25 HDFS-6404. HttpFS should use a 000 umask for mkdir and create operations. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598669 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 16:51:04 +00:00
Arpit Agarwal d1b7433a62 HADOOP-9968 and HADOOP-10448. Merging r1570934 and 1598396 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598440 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 23:38:07 +00:00
Chris Nauroth c19b55ce32 HDFS-6463. Merging change r1598437 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598438 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 23:08:52 +00:00
Andrew Wang e3bd43766f HDFS-6447. balancer should timestamp the completion message. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598412 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:39:09 +00:00
Andrew Wang 72aaab255d HDFS-6356. Merged from r1598408. Fix typo in DatanodeLayoutVersion. Contributed by Tulasi G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598409 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:33:22 +00:00
Brandon Li e4346e9877 HDFS-6462. Merging change r1598405 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598407 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:19:17 +00:00
Andrew Wang b5e9d1e8bd HDFS-6461. Use Time#monotonicNow to compute duration in DataNode#shutDown. Contributed by James Thomas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598400 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:02:31 +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
Andrew Wang e82172c455 HDFS-6453. Use Time#monotonicNow to avoid system clock reset. Contributed by Liang Xie. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598145 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 21:25:55 +00:00
Arpit Agarwal d25d41d49b HADOOP-10566. Refactor proxyservers out of ProxyUsers. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598140 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 21:12:06 +00:00
Arpit Agarwal b97fac3359 HDFS-6442: Merging r1598078 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598081 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 17:45:21 +00:00
Colin McCabe f8dd75e7e9 HDFS-6448. BlockReaderLocalLegacy should set socket timeout based on conf.socketTimeout (liangxie via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598080 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 17:44:38 +00:00
Brandon Li 14ea885990 HDFS-6411. Merging change r1597895 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597896 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 23:05:15 +00:00
Brandon Li 3bd21e8814 HDFS-6416. Merging change r1597868 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597870 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 20:26:12 +00:00
Jing Zhao 3bfc0088f4 HDFS-6227. Merge r1597829 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597830 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 17:23:29 +00:00
Michael Stack 4206ef2611 HBASE-6110 adding more slow action log in critical write path (Liang Xie via stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597634 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-26 19:44:02 +00:00
Arpit Agarwal 2fe6e4ccfe HDFS-6443: Merging r1597238 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597240 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-24 05:09:39 +00:00
Andrew Wang 2a9d3a8824 HDFS-6435. Merged from r1596966. Add support for specifying a static uid/gid mapping for the NFS gateway. (atm via wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596967 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 20:45:13 +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
Jing Zhao 380bb4de57 HDFS-6423. Merge r1596774 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596775 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 08:08:56 +00:00
Jing Zhao 2858c7f470 HDFS-6438. Merge r1596772 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596773 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 07:32:13 +00:00
Chris Nauroth 378153dd71 HDFS-6433. Merging change r1596742 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596745 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 04:58:39 +00:00
Chris Nauroth c362382259 HDFS-6409. Merging change r1596739 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596740 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 04:43:59 +00:00
Andrew Wang 1ad5343c1f HDFS-6396. Remove support for ACL feature from INodeSymlink. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596717 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 00:16:02 +00:00
Kihwal Lee 1f3ec0616a svn merge -c 1596344 merging from trunk to branch-2 to fix:HDFS-6419. TestBookKeeperHACheckpoints.TestSBNCheckpoints fails on trunk. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596352 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 18:19:54 +00:00
Jing Zhao ffc50dfe01 HDFS-6432. Merge r1596334 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596335 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 17:35:14 +00:00
Colin McCabe 11bb19d1ff HDFS-6421. Fix vecsum.c compile on BSD and some other systems (Mit Desai via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596325 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 17:20:00 +00:00
Kihwal Lee 2649b38262 svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam. Fixing merge error 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595984 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 18:02:25 +00:00
Kihwal Lee c412a2bdf7 svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595980 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 17:54:18 +00:00
Konstantin Boudnik 0527d364e5 Merge r1595744 from trunk. HDFS-6325. Append should fail if the last block has insufficient number of replicas (Keith Pak via cos) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595745 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 05:26:44 +00:00
Colin McCabe 88335a843f HDFS-4913. Deleting file through fuse-dfs when using trash fails, requiring root permissions (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595372 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 22:24:54 +00:00
Aaron Myers 3f617e325c HDFS-6406. Add capability for NFS gateway to reject connections from unprivileged ports. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595352 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 21:25:05 +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
Junping Du 584caaef1b Merge r1595145 from trunk: HDFS-6250. Fix test failed in TestBalancerWithNodeGroup.testBalancerWithRackLocality (Contributed by Binglin Chang and Chen He 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595146 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 09:59:24 +00:00
Andrew Wang c8ba7039b7 HDFS-6345. DFS.listCacheDirectives() should allow filtering based on cache directive ID. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595087 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 01:19:17 +00:00
Chris Nauroth 17c08afc83 HDFS-6402. Merging change r1595070 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595071 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 23:17:23 +00:00
Arpit Agarwal b8c97091cc HDFS-6362. Merge r1595056 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595066 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 22:41:01 +00:00
Arpit Agarwal 8970cf4d86 HDFS-4052. Merge r1398631 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595063 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 22:21:48 +00:00
Andrew Wang 81cf200155 HDFS-5683. Better audit log messages for caching operations. Contributed by Abhiraj Butala. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595057 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 21:30:22 +00:00
Brandon Li 3a9110ac05 HDFS-6361. Merging change r1595050 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595053 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 21:27:43 +00:00
Kihwal Lee d4d3cf1210 svn merge -c 1594917 merging from trunk to branch-2 to fix:HDFS-6400. Cannot execute hdfs oiv_legacy. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594918 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 13:54:38 +00:00
Colin McCabe 44ef591ff0 HDFS-6287. Add vecsum test of libhdfs read access times (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594752 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 00:30:03 +00:00
Chris Nauroth 6af77d3cd3 HDFS-6326. Merging change r1594743 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594746 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 22:44:21 +00:00
Kihwal Lee fe0180dd6c svn merge -c 1594709 merging from trunk to branch-2 to fix:HDFS-2949. Add check to active state transition to prevent operator-induced split brain. Contributed by Rushabh S Shah. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594710 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 20:46:38 +00:00
Jing Zhao 08a1301381 HDFS-6381. Merge r1594447 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594448 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 02:52:41 +00:00
Kihwal Lee f4b4bf14d3 HDFS-6293. Issues with OIV processing PB-based fsimages. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594440 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 01:15:48 +00:00
Chris Nauroth b989f9780a HDFS-6370. Merging change r1594362 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594365 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 20:11:40 +00:00
Colin McCabe 7b27dcf4dc HDFS-6355. Fix divide-by-zero, improper use of wall-clock time in BlockPoolSliceScanner (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594339 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 19:25:23 +00:00
Jing Zhao 8fb3e34e74 HDFS-6186. Merge change r1594314 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594324 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 18:41:07 +00:00
Brandon Li 090003221e HADOOP-10572. Merging change r1594289 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594291 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 17:12:03 +00:00
Suresh Srinivas 99025aacd6 Revert the commit r1594283 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594285 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 17:01:24 +00:00
Suresh Srinivas 196ee73e9a HADOOP-10566. Adding files missed in previous commit 1594280 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594283 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 17:00:01 +00:00
Jonathan Turner Eagles d389c8940e HDFS-6305. WebHdfs response decoding may throw RuntimeExceptions (Daryn Sharp via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594274 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 16:43:30 +00:00
Kihwal Lee a7e29582c3 svn merge -c 1594263 merging from trunk to branch-2 to fix:HDFS-6334. Client failover proxy provider for IP failover based NN HA. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594264 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 16:21:20 +00:00
Uma Maheswara Rao G 72763dbee9 Merge. HDFS-6367. EnumSetParam$Domain#parse fails for parameter containing more than one enum. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594151 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 07:36:22 +00:00
Kihwal Lee 5ee9c6f28a svn merge -c 1594055 merging from trunk to branch-2 to fix:HDFS-5522. Datanode disk error check may be incorrectly skipped. Contributed by Rushabh Shah. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594056 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-12 19:09:42 +00:00
Haohui Mai ab40d65107 HDFS-6230. Merge r1594040 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594041 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-12 18:04:01 +00:00
Andrew Wang c579bef2fc HDFS-6351. Command hdfs dfs -rm -r can't remove empty directory. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594037 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-12 17:55:23 +00:00
Haohui Mai d7b201a16d HDFS-6328. Merge r1593755 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593756 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-11 05:08:03 +00:00
Colin McCabe fea7cd3c12 HDFS-6294. Use INode IDs to avoid conflicts when a file open for write is renamed (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593638 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 22:55:17 +00:00
Haohui Mai 03b04fbe28 HDFS-6240. Merge r1593591 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593593 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 18:45:19 +00:00
Kihwal Lee d39b25b0e3 svn merge -c 1593475 merging from trunk to branch-2 to fix:HDFS-6313. WebHdfs may use the wrong NN when configured for multiple HA NNs. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593476 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 02:03:27 +00:00
Kihwal Lee 26601f37b0 Fix CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593474 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 01:52:49 +00:00
Kihwal Lee 93cc9f7e97 svn merge -c 1593470 merging from trunk to branch-2 to fix:HDFS-6329. WebHdfs does not work if HA is enabled on NN but logical URI is not configured. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593471 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 01:48:28 +00:00
Arpit Agarwal 92fdc7113f HDFS-6340: Merging r1593436 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593437 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 22:21:10 +00:00
Kihwal Lee 76bfc73cc9 svn merge -c 1593362 merging from trunk to branch-2 to fix:HADOOP-10158. SPNEGO should work with multiple interfaces/SPNs. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593363 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 18:28:22 +00:00
Colin McCabe 0e76ba79d6 HDFS-5381. ExtendedBlock#hashCode should use both blockId and block pool ID (Benoy Antony via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593348 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 17:50:24 +00:00
Haohui Mai caa1107813 HADOOP-10471. Merge r1592915 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592917 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 22:45:03 +00:00
Uma Maheswara Rao G 9f54a6f230 Merge. HDFS-6337. Setfacl testcase is failing due to dash character in username in TestAclCLI. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592491 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-05 11:56:53 +00:00
Andrew Wang 4abbc157e1 HDFS-6295. Add decommissioning state and node state filtering to dfsadmin. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592439 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-05 03:40:00 +00:00
Tsz-wo Sze 75955e7c50 svn merge -c 1592179 from trunk for HDFS-5168. Add cross node dependency support to BlockPlacementPolicy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592181 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-03 11:04:35 +00:00
Aaron Myers fdf685576e HDFS-6289. HA failover can fail if there are pending DN messages for DNs which no longer exist. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591414 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-30 17:48:17 +00:00
Haohui Mai 915b7bc3a6 HDFS-6304. Merge r1591411 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591412 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-30 17:45:57 +00:00
Jonathan Turner Eagles e1313e7f89 HDFS-6269. NameNode Audit Log should differentiate between webHDFS open and HDFS open. (Eric Payne via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591118 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 21:53:36 +00:00
Arpit Agarwal fa889d0ef6 HADOOP-10547: Merging r1591098 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591099 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 20:43:42 +00:00
Arpit Agarwal a325ab0e59 HADOOP-10547: Merging r1591095 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591097 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 20:41:05 +00:00
Haohui Mai 1bb274a26e Move the changelist of HDFS-5892 fro 2.4.0 to 2.5.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591032 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 17:49:22 +00:00
Vinayakumar B 8be14bbf65 Merge r1590941 from trunk, HDFS-2882. DN continues to start up, even if block pool fails to initialize (Contributed by Vinayakumar B) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590944 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 10:40:36 +00:00
Haohui Mai f37186167a HADOOP-10508. Merge r1590876 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590877 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 06:06:18 +00:00
Andrew Wang d0bff50fed HDFS-6288. DFSInputStream Pread doesn't update ReadStatistics. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590778 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-28 20:23:48 +00:00
Kihwal Lee 0f770f0897 svn merge -c 1590640 merging from trunk to branch-2 to fix:HDFS-6218. Audit log should use true client IP for proxied webhdfs operations. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590641 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-28 14:01:39 +00:00
Haohui Mai 86f1b41d28 HDFS-6270. Merge r1590197 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590198 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 23:50:48 +00:00
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 1f7b6d319b HDFS-6273: Merging r1589808 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589809 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 18:05:06 +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