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

1676 Commits

Author SHA1 Message Date
Jing Zhao bba2cfab96 HDFS-5440. Merge change 1541665 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541671 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 19:34:08 +00:00
Jing Zhao f1aa8a866c HDFS-5425. Merge change r1541261 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541271 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 22:15:04 +00:00
Andrew Wang 90fbbb8138 HDFS-5495. Remove further JUnit3 usages from HDFS. Contributed by Jarek Jarcec Cecho. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540916 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 02:05:10 +00:00
Jing Zhao fb08c97e7e HDFS-5488. Merge change r1540894 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540897 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 00:27:12 +00:00
Andrew Wang b458fc7d9c HDFS-5467. Remove tab characters in hdfs-default.xml. Contributed by Shinichi Yamashita. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540815 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-11 19:24:44 +00:00
Brandon Li 65fd32800d HDFS-5469. Merging change r1540443 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540444 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-10 04:25:57 +00:00
Jing Zhao 6df4fc4e92 HDFS-5325. Merge change r1540235 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540237 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-09 01:25:11 +00:00
Jing Zhao 76a7119930 HDFS-5371. Merge change r1540197 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540200 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-08 21:43:15 +00:00
Jing Zhao 37e18a4c0b HDFS-5476. Merge change r1540142 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540144 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-08 18:22:35 +00:00
Brandon Li 5f82524fe3 HDFS-5364. Merging change r1539834 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539891 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-08 01:03:10 +00:00
Jing Zhao cbe493200b HDFS-5443. Merge change r1539754 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539758 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-07 18:45:15 +00:00
Brandon Li f87469c7aa HDFS-5252. Merging change r1539740 form trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539742 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-07 18:10:33 +00:00
Andrew Wang b58d5bad64 HDFS-5458. Datanode failed volume threshold ignored if exception is thrown in getDataDirsFromURIs. Contributed by Mike Mellenthin. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539092 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-05 18:27:06 +00:00
Jing Zhao 213bf915fd HDFS-5427. Merge change r1538875 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538876 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-05 06:45:31 +00:00
Chris Nauroth 259a78120b HDFS-5456. Merging change r1538872 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538873 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-05 06:06:54 +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
Uma Maheswara Rao G 7d86f49109 Merge HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. Contributed by Sathish. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538158 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-02 09:07:59 +00:00
Andrew Wang 98575f07cc Move HDFS-5035 to 2.2.1 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538122 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-02 01:07:36 +00:00
Andrew Wang 7c9efe4095 HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538061 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-01 20:58:23 +00:00
Chris Nauroth 8992fecc1d HDFS-4633. Merging change r1461846 and r1537345 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537347 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-30 23:50:22 +00:00
Chris Nauroth 52af62711f HDFS-5065. Merging change r1537319 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537320 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-30 21:53:23 +00:00
Chris Nauroth 3c9728b41e HDFS-5432. Merging change r1537230 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537232 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-30 18:40:36 +00:00
Andrew Wang ed3161c331 HDFS-5433. When reloading fsimage during checkpointing, we should clear existing snapshottable directories. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537194 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-30 17:29:14 +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
Colin McCabe 11b73ddbcc move HDFS-4657 to branch-2.2.1 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536886 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 21:01:51 +00:00
Chris Nauroth 011733b686 HDFS-5413. Merging change r1536448 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536450 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-28 17:58:14 +00:00
Jing Zhao 9c78f870d8 HDFS-5257. Merge change r1535811 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535813 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-25 18:46:57 +00:00
Brandon Li c86c303a62 HDFS-5171. Merging change r1535586 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535588 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-24 23:52:16 +00:00
Kihwal Lee 82d08eb6d4 svn merge -c 1535188 merging from trunk to branch-2 to fix HDFS-5341. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535190 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 21:31:23 +00:00
Jing Zhao 9a3e05cc6c HDFS-5363. Merge change r1535169 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535183 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 21:04:58 +00:00
Aaron Myers 3e65694f2b HDFS-5403. WebHdfs client cannot communicate with older WebHdfs servers post HDFS-5306. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535057 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-23 15:20:35 +00:00
Colin McCabe f6aa656ff3 HDFS-5400. DFS_CLIENT_MMAP_CACHE_THREAD_RUNS_PER_TIMEOUT constant is set to the wrong value (Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534656 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-22 15:13:12 +00:00
Tsz-wo Sze a5d967a4dc svn merge -c 1534426 from trunk for HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534427 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-22 00:21:24 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-21 21:20:35 +00:00
Jing Zhao 7a45ef2300 HDFS-5382. Merge change r1534368 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534374 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-21 21:10:57 +00:00
Uma Maheswara Rao G a2c2913f54 Merge HDFS-5331 make SnapshotDiff.java to a o.a.h.util.Tool interface implementation. Contributed by Vinay. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533918 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-20 15:34:08 +00:00
Chris Nauroth 240156ad51 HDFS-5365. Merging change r1533574 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533575 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 18:15:19 +00:00
Jonathan Turner Eagles 875fe36d9e HDFS-4511. Cover package org.apache.hadoop.hdfs.tools with unit test (Andrey Klochkov via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533545 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 16:40:09 +00:00
Chris Nauroth 9fa1fca1da HDFS-5365. Merging change r1533283 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533285 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 23:07:15 +00:00
Suresh Srinivas 341272da8b HDFS-5375. Merge 1533258 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533259 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 20:48:39 +00:00
Chris Nauroth 4723e3e00f HDFS-5336. Merging change r1533183 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533184 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 18:10:09 +00:00
Jing Zhao 10db2ed897 HDFS-5379. Merge change r1533181 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533182 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 18:00:03 +00:00
Chris Nauroth 7325bf4a28 HDFS-5375. Merging change r1533165 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533166 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 17:16:05 +00:00
Jing Zhao b2fcad6d36 HDFS-5334. Merge change r1532949 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532950 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 01:36:17 +00:00
Andrew Wang 5776b0b324 HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532938 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 23:16:13 +00:00
Tsz-wo Sze 0b18a51c33 svn merge -c 1532932 from trunk for HDFS-4376. Fix race conditions in Balancer. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532933 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 23:06:46 +00:00
Jonathan Turner Eagles 186581fef2 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532929 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 22:47:16 +00:00
Kihwal Lee 0c4da3693a svn merge -c 1532915 Merging from trunk to branch-2 to fix HDFS-5346. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532916 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 21:15:47 +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
Suresh Srinivas 17b20d742d HDFS-5370. Merge 1532899 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532902 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 20:47:31 +00:00
Tsz-wo Sze 71b1436bcc svn merge -c 1532860 from trunk for adding TestOpenFilesWithSnapshot.java for HDFS-5283. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532861 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 18:47:42 +00:00
Tsz-wo Sze b2e641e31f svn merge -c 1532857 from trunk for HDFS-5283. Under construction blocks only inside snapshots should not be counted in safemode threshhold. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532858 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 18:39:24 +00:00
Jing Zhao 9590b4b93d HDFS-5130. Merge change r1532580 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532581 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 22:50:44 +00:00
Brandon Li 218b1cc69c HDFS-5330. Merging change r1532539 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532543 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 21:30:18 +00:00
Tsz-wo Sze ce9da0e32c svn merge -c 1532468 from trunk for HDFS-5338. Add a conf to disable hostname check in datanode registration. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532473 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 18:25:20 +00:00
Jing Zhao e724cd97fe HDFS-5352. Merge change r1532158 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532159 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-15 01:19:06 +00:00
Jing Zhao 34beb4eb79 HDFS-5342. Merge change r1532090 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532092 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-14 21:02:04 +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
Brandon Li d890e365c8 HDFS-5329. Merging change 1531617 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531618 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-13 05:33:12 +00:00
Luke Lu b96dfe531c Fix typo (HDFS-5276 -> HDFS-5267) in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531503 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-12 04:58:32 +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
Jing Zhao c89a36106e HDFS-5322. Merge change r1531436 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531440 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-11 21:53:29 +00:00
Luke Lu 7d83886767 HDFS-5276. Remove volatile from LightWeightHashSet. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531224 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-11 08:27:32 +00:00
Suresh Srinivas 2a60a8c3c4 HDFS-5335. Merge 1531152 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531153 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-11 00:03:28 +00:00
Brandon Li 1c128966f3 HDFS-5337. Merging change r1530835 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530836 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-10 01:04:38 +00:00
Colin McCabe 3bc8333232 HDFS-5323. Remove some deadcode in BlockManager (Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530831 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 23:17:02 +00:00
Kihwal Lee 39d1443e3f svn merge -c 1530669 merging from trunk to branch-2 to fix HDFS-4510. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530672 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 15:12:29 +00:00
Daryn Sharp 2031005eeb HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 15:10:43 +00:00
Brandon Li e79cdd2d9c HDFS-5281. Merging change r1530461 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530468 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 00:10:48 +00:00
Brandon Li 991faf598f HDFS-5316. Merging change 1530150 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530153 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-08 04:42:06 +00:00
Arun Murthy c3dff760d9 Moving recent bug-fixes to hadoop-2.2.1. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-08 02:05:03 +00:00
Brandon Li ad8948e8e0 HDFS-5317. Merging change r1530114 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530117 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-08 00:27:39 +00:00
Jing Zhao cd4411ce1c HDFS-5291. Merge change r1530112 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530113 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-08 00:03:26 +00:00
Brandon Li 2451b38e8e HDFS-5307. Merging change r1530027 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530033 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-07 19:15:29 +00:00
Arun Murthy c0da67e579 HDFS-4817. Moving changelog to Release 2.2.0 section to reflect the backport. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529753 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-07 05:32:41 +00:00
Arun Murthy 3b514585f1 Preparing for hadoop-2.2.0 release. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-07 05:32:18 +00:00
Brandon Li 254e87700f HDFS-5259. Merging change r1529730 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529735 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-07 03:39:43 +00:00
Jing Zhao a59090bbdc HDFS-5299. Merge change r1529660 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529661 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-06 18:42:08 +00:00
Jing Zhao 3f0c90f6b5 HADOOP-10017. Merge change r1529571 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529572 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-06 06:24:32 +00:00
Brandon Li 3bb402c70f HDFS-5306. Merging change r1529562 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529563 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-06 04:21:59 +00:00
Jing Zhao 0de66e4a77 HDFS-5308. Merge change r1529512 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529516 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-05 20:46:52 +00:00
Jing Zhao f6a21000d4 HDFS-5300. Merge change r1529294 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529305 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-04 21:14:56 +00:00
Aaron Myers 032fbb549e HDFS-5289. Race condition in TestRetryCacheWithHA#testCreateSymlink causes spurious test failure. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528694 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-03 00:42:20 +00:00
Chris Nauroth a5d9aaad12 HDFS-5279. Merging change r1528308 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528310 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 05:37:21 +00:00
Suresh Srinivas 09d2301b63 HADOOP-10012. Merge 1528301 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528302 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 04:11:26 +00:00
Arpit Agarwal 13bfd0971e HDFS-5255. Merging r1528279 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528282 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-02 00:09:08 +00:00
Kihwal Lee dc2d77bde2 HDFS-4512. Cover package org.apache.hadoop.hdfs.server.common with tests. Contributed by Vadim Bondarev. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528098 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-01 14:05:16 +00:00
Kihwal Lee 4e4dd0f15c svn merge -c 1527807. merging from trunk to branch-2 to fix HDFS-4517. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527808 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-30 22:33:01 +00:00
Brandon Li 320c7519ed HDFS-5230. Merging change r1527726 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527741 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-30 19:37:33 +00:00
Brandon Li e26ac59ca0 HDFS-5256. Merging change r1527452 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527453 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-30 06:13:27 +00:00
Chris Nauroth f040bd0739 HDFS-5260. Merging change r1527113 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527115 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 22:56:54 +00:00
Jing Zhao 030c3c99e8 HDFS-5265. Merge change r1527093 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527096 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 21:53:33 +00:00
Brandon Li c4df7fb70e HDFS-5268. Merging change r1527087 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527092 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 21:37:47 +00:00
Kihwal Lee d680392e39 Fixing up CHANGES.txt for HDFS-5031. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527086 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 21:20:46 +00:00
Chris Nauroth 16794494d3 HDFS-5186. Merging change r1526615 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526617 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 17:34:29 +00:00
Chris Nauroth ee97d95c33 HDFS-5258. Merging change r1526610 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526611 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 17:24:26 +00:00
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-26 15:24:40 +00:00
Brandon Li 61a00d87d5 HDFS-5246. Merging change r1526316 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526319 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 22:16:34 +00:00
Colin McCabe 138fd7581f HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526300 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 20:58:37 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-25 00:37:14 +00:00
Tsz-wo Sze 51ae59ec51 svn merge -c 1525828 from trunk for HDFS-5228. The RemoteIterator returned by DistributedFileSystem.listFiles may throw NullPointerException. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525829 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 10:17:46 +00:00
Suresh Srinivas 3227545fe7 HDFS-5251. Merge 1525787 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525792 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 05:38:42 +00:00
Brandon Li 360a4e5f03 HDFS-5249. Merging change r1525770 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525771 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 04:19:22 +00:00
Jing Zhao b35d226b62 HDFS-4971. Merge change r1525681 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525688 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 20:26:20 +00:00
Arpit Agarwal 4af31993a2 HDFS-5139. Merge r1525665 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525667 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 18:19:48 +00:00
Arpit Agarwal 8f354d141e HDFS-5139. Merge r1525659 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525661 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 18:03:27 +00:00
Daryn Sharp fa0ecb7567 merge -c 1525626 FIXES: HDFS-5240. Separate formatting from logging in the audit logger API (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525627 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 15:34:05 +00:00
Daryn Sharp 15f857c59c merge -c 1525624 FIXES: HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525625 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 15:29:40 +00:00
Jing Zhao c084582988 HDFS-5231. Merge change r1525133 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525134 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-20 20:35:45 +00:00
Brandon Li b7f0156ad8 HDFS-5234. Merging change r1525104 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525109 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-20 19:11:33 +00:00
Colin McCabe 7ce1a859a8 HADOOP-9929. Insufficient permission for a path reported as file not found. (Contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524610 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 02:03:42 +00:00
Jing Zhao 27cc6911ea Merge change r1524581 from trunk: move HDFS-5122 from Release 2.1.1-beta to Release 2.3.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524583 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 21:34:42 +00:00
Jing Zhao 3babe7c124 HDFS-5122. Merge change r1524562 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524566 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 20:59:36 +00:00
Arpit Agarwal 57f5be4885 HDFS-5031. Merge change r1524553 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524556 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 20:21:48 +00:00
Jing Zhao 23d5e348c8 HDFS-5219. Merge change r1524498 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524499 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 17:32:20 +00:00
Jing Zhao 8855a3e0ee HDFS-5212. Merge change r1524298 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524302 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 06:26:57 +00:00
Jing Zhao 0ce8f0b3c2 HDFS-5199. Merge change r1523140 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524300 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 06:19:36 +00:00
Arun Murthy 3836473c73 Preparing for hadoop-2.1.1-beta release. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-17 05:23:39 +00:00
Tsz-wo Sze d03b60c61a svn merge -c 1523875 from trunk for HDFS-5207. In BlockPlacementPolicy.chooseTarget(..), change the writer and the excludedNodes parameter types respectively to Node and Set. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523877 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-17 02:51:45 +00:00
Alejandro Abdelnur 89df2ae5c9 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523597 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-16 11:31:17 +00:00
Tsz-wo Sze 9c98bb8175 svn merge -c 1523400 from trunk for HDFS-5188. In BlockPlacementPolicy, reduce the number of chooseTarget(..) methods; replace HashMap with Map in parameter declarations and cleanup some related code. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523401 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-15 04:25:50 +00:00
Jing Zhao 988d4c123e HDFS-4096. Merge change r1523091 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523092 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-13 20:44:58 +00:00
Jing Zhao a344423199 HDFS-5192. Merge change r1522775 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522777 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-13 04:35:52 +00:00
Brandon Li 95b902fb1e HDFS-5067. Merging change r1522774 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522776 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-13 04:31:51 +00:00
Andrew Wang bd257baef5 Move HDFS-4680 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522048 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-11 21:17:08 +00:00
Andrew Wang 1d4d1d8f70 HDFS-4680. Audit logging of delegation tokens for MR tracing. (Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522015 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-11 20:04:50 +00:00
Jing Zhao b3076b00ce HDFS-5085. Merge change r1521601 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521607 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-10 19:39:36 +00:00
Andrew Wang 5609b5e654 HDFS-5170. BlockPlacementPolicyDefault uses the wrong classname when alerting to enable debug logging. (Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520962 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-09 04:56:16 +00:00
Andrew Wang 7cb29ba170 Revert HADOOP-9877 because of issues reported at HADOOP-9912 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520712 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 22:53:26 +00:00
Colin McCabe 36ed17388e HDFS-4879. Add BlockedArrayList collection to avoid CMS full GCs (Contributed by Todd Lipcon) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520669 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 19:09:41 +00:00
Jing Zhao b1d90490c8 Merge change r1520650 from trunk: move HDFS-5118 to 2.1.1-beta section. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520652 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 18:17:53 +00:00
Jing Zhao f059931fed HDFS-5118. Merge change r1520637 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520639 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 17:24:44 +00:00
Colin McCabe 461587e36a HDFS-5164. DeleteSnapshot should check if OperationCategory.WRITE is possible before taking write lock (contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520494 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 05:27:59 +00:00
Chris Nauroth 4c66560499 HDFS-4491. Merging change r1520479 and r1520482 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520485 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 03:28:00 +00:00
Aaron Myers c79ca11fed HDFS-5159. Secondary NameNode fails to checkpoint if error occurs downloading edits on first checkpoint. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520366 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-05 16:31:50 +00:00
Kihwal Lee 3558b9274e svn merge -c 1519681 merging from trunk to branch-2 to fix HDFS-5150. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519682 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-03 13:51:20 +00:00
Brandon Li fa39efe421 Merging change r1519222 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519229 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-31 21:24:47 +00:00
Suresh Srinivas 2982a8ee13 Fix CHANGES.txt to remove repeated sections for 2.3.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518908 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 08:11:42 +00:00
Jing Zhao 9a55c1dc66 HDFS-5140. Merge change r1518899 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518902 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 07:40:43 +00:00
Suresh Srinivas ce623c2ce8 HDFS-5144. Merge r1518895 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518896 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 07:20:50 +00:00
Konstantin Shvachko cd978548cf HDFS-5077. NPE in FSNamesystem.commitBlockSynchronization(). Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518852 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 23:08:47 +00:00
Brandon Li bd1c2de914 HDFS-5078. Merging change r1518292 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518813 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-29 20:33:25 +00:00
Kihwal Lee 6c8ce84d0b Adding the new test file for HDFS-3245 that was accidentally dropped 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517995 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-27 21:15:41 +00:00
Kihwal Lee fe800d3b88 svn merge -c 1517989 merging from trunk to branch-2 to fix HDFS-5132. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517990 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-27 21:06:12 +00:00
Kihwal Lee 5b01125048 HDFS-5128. Allow multiple net interfaces to be used with HA namenode RPC server. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517982 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-27 20:56:15 +00:00
Kihwal Lee 7246828377 HDFS-3245. Add metrics and web UI for cluster version summary. Contributed by Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517942 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-27 19:25:29 +00:00
Brandon Li 80ead68bfc HDFS-4947. Merging change r1517040 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517049 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 21:26:23 +00:00
Jonathan Turner Eagles 773cab510f HDFS-4329. DFSShell issues with directories with spaces in name (Cristina L. Abad via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516908 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 15:56:26 +00:00
Jing Zhao 3460ffa8e7 HDFS-5124. Merge change r1516671 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516672 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 00:58:12 +00:00
Jing Zhao 693146983e HDFS-5045. Merge change r1516348 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516349 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 01:09:06 +00:00
Kihwal Lee 42ab6e6247 svn merge -c 1516237 merging from trunk to branch-2 to fix HDFS-4994. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516242 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 18:18:45 +00:00
Brandon Li 992a046b89 HDFS-5069. Merging change r1516232 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516239 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 18:17:23 +00:00
Andrew Wang 1bc892472c HADOOP-9877. Fix listing of snapshot directories in globStatus. (Binglin Chang via Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516236 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 18:06:58 +00:00
Luke Lu d83061b71b HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 10:13:17 +00:00
Chris Nauroth 20b49d292c HDFS-4594. Merging change r1515989 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516008 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 22:45:12 +00:00
Andrew Wang d21d74744c Revert HADOOP-9877, patch did not apply cleanly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515998 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 22:34:46 +00:00
Andrew Wang 81960c2f91 HADOOP-9877. Fix listing of snapshot directories in globStatus. (Binglin Chang via Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515956 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 20:24:03 +00:00
Jing Zhao b7567168db HDFS-5111. Merge change r1515895 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515896 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 17:35:18 +00:00
Arpit Agarwal 42d21469ef HDFS-2933. Merging changes r1515890 and r1515892 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515894 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 17:32:50 +00:00
Sanford Ryza 11123a1b26 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515713 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-20 06:29:34 +00:00
Brandon Li 31cd76bd4b HDFS-5110. Mreging change r1515624 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515630 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-19 22:04:32 +00:00
Brandon Li 1c58240ffc HDFS-5107. Merging change r1515166 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515218 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-18 21:20:02 +00:00
Brandon Li 77c5db3940 HDFS-5104. Merging change r1515042 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515043 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-17 21:48:16 +00:00
Jing Zhao 8c6234aa00 HADOOP-9880. Merge change r1514913 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514915 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 22:39:26 +00:00
Chris Nauroth f766cc09ac HDFS-5106. Merging change r1514911 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514914 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 22:37:24 +00:00
Arpit Agarwal dc550bfe41 HDFS-5105. Merging change r1514852 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514872 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 20:01:53 +00:00
Jing Zhao d3639218b2 HDFS-5102. Merge change r1514797 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514802 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 17:19:06 +00:00
Chris Nauroth 1f0d7631d5 HDFS-5103. Merging change r1514576 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514577 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 04:43:00 +00:00
Chris Nauroth ce6ba40569 HDFS-5100. Merging change r1514573 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514574 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-16 04:23:32 +00:00
Colin McCabe 15bdf14151 HADOOP-9865. FileContext#globStatus has a regression with respect to relative path. (Contributed by Chaun Lin) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514536 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 23:10:06 +00:00
Konstantin Shvachko 7751a058f3 HDFS-2994. If lease soft limit is recovered successfully the append can fail. Contributed by Tao Luo. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514501 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 21:24:16 +00:00
Chris Nauroth ba0456da0e HDFS-5099. Merging change r1514481 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514484 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 20:49:13 +00:00
Arun Murthy aa3f77675b Preparing for hadoop-2.1.0-beta rc2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514471 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 20:34:25 +00:00
Jing Zhao f36a6c55f2 HDFS-5076. Merge change r1514422 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514429 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 18:27:55 +00:00
Jing Zhao 5155be23e3 HDFS-5080. Merge change r1514386 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514391 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 17:33:31 +00:00
Chris Nauroth ed114b4b13 HDFS-5093. Merging change r1514366 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514369 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 16:56:09 +00:00
Chris Nauroth aaada1c859 HDFS-4632. Merging change r1514168 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514169 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 06:14:41 +00:00
Tsz-wo Sze 49dcb7cfaa svn merge -c 1514156 from trunk for HDFS-4898. BlockPlacementPolicyWithNodeGroup.chooseRemoteRack() fails to properly fallback to local rack. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514157 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 04:55:33 +00:00
Konstantin Shvachko 2c37463d7e HDFS-5068. Convert NNThroughputBenchmark to a Tool to allow generic options. Contributed by Konstantin Shvachko. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514115 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 01:19:57 +00:00
Suresh Srinivas 9b1a3099f1 HDFS-5051. Merge 1514110 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514111 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 00:49:40 +00:00
Andrew Wang 4a368594c9 HDFS-4816. transitionToActive blocks if the SBN is doing checkpoint image transfer. (Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514097 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 23:38:07 +00:00
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 22:25:26 +00:00
Jing Zhao 72fd3b48e5 HDFS-5091. Merge change r1513700 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513701 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-14 00:28:29 +00:00
Andrew Wang d8a025bb28 HADOOP-9847. TestGlobPath symlink tests fail to cleanup properly. (cmccabe via wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513255 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-12 20:55:03 +00:00
Ivan Mitic 8e71151845 HDFS-5065. Merging change r1512870 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512871 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-11 04:56:44 +00:00
Kihwal Lee da44e0e909 svn merge -c 1512451 merging from trunk to branch-2 to fix HDFS-4993. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512452 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-09 19:15:04 +00:00
Kihwal Lee be700565a4 HDFS-5083. Update the HDFS compatibility version range. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512442 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-09 18:51:45 +00:00
Kihwal Lee 22743ed74b svn merge -c 1512057 merging from trunk to branch-2 to fix HDFS-5047. Supress logging of full stack trace of quota and lease exceptions. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512058 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-08 21:48:31 +00:00
Brandon Li 50950fd3ff HDFS-4763. Merging change r1511519 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511522 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-07 22:30:51 +00:00
Brandon Li 39d623df14 HDFS-5071. Merging change r1511502 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511505 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-07 21:30:59 +00:00
Jing Zhao 8dfe7e0aa4 HDFS-4926. Merge change r1511477 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511478 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-07 20:40:36 +00:00
Andrew Wang afa778b8f9 HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work with symlinks. (Colin Patrick McCabe via Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510816 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 23:42:39 +00:00
Chris Nauroth 9541a31f1d HDFS-4905. Merging change r1510773 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510780 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 22:11:30 +00:00
Brandon Li 2a11c30441 move HDFS-4962,HDFS-5043 to the right section in hadoop-hdfs/CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510663 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 19:09:19 +00:00
Suresh Srinivas 1df1391cca HDFS-5061. Merge 1510611 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510626 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-05 17:49:07 +00:00
Colin McCabe df120f00c1 HADOOP-9761. ViewFileSystem#rename fails when using DistributedFileSystem (Andrew Wang via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509876 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-02 21:47:43 +00:00
Tsz-wo Sze 65ae6f9eed svn merge -c 1509565 from trunk for HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509566 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-02 07:12:28 +00:00
Brandon Li d3946f980a HDFS-4962. Merging change r1501851 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509386 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 19:05:28 +00:00
Tsz-wo Sze 13748aa808 svn merge -c 1509075 from trunk for HDFS-4513. Clarify in the WebHDFS REST API that all JSON respsonses may contain additional properties. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509076 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 03:48:42 +00:00