Commit Graph

1473 Commits

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