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

1333 Commits

Author SHA1 Message Date
Suresh Srinivas cd5b7bdf06 HDFS-4917. Merge 1494433 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494434 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 03:58:06 +00:00
Colin McCabe b5d2b0a121 HDFS-4461. DirectoryScanner: volume prefix takes up memory for every block that is scanned (Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494403 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-19 00:40:22 +00:00
Aaron Myers 6feda0aa3b HDFS-4906. HDFS Output streams should not accept writes after being closed. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494304 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 21:08:37 +00:00
Chris Nauroth 7c668da943 HDFS-4818. Merging change r1494023 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494024 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 05:03:38 +00:00
Colin McCabe f32c75aeb6 HDFS-4626. ClientProtocol#getLinkTarget should throw an exception for non-symlink and non-existent paths. (Andrew Wang via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493987 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-18 02:29:03 +00:00
Chris Nauroth 8eab891bff HDFS-4910. TestPermission failed in branch-2. Contributed by Chuan Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493932 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 20:54:34 +00:00
Jing Zhao f77fff4b40 HDFS-4875. Merging change r1493850 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493854 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-17 17:44:05 +00:00
Chris Nauroth 2d8999dc35 HDFS-4866. Merging change r1493300 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493301 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-15 04:05:48 +00:00
Colin McCabe 487b143b14 Add missing file for HDFS-3934 (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493249 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 21:14:33 +00:00
Colin McCabe 043d5fc97d HDFS-3934. duplicative dfs_hosts entries handled wrong (all files) (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493234 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 20:25:12 +00:00
Chris Nauroth 0c49c66cf3 HDFS-4783. Merging change r1493149 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493151 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 16:47:46 +00:00
Tsz-wo Sze f15b150f03 svn merge -c 1492941 from trunk for HDFS-4845. FSNamesystem.deleteInternal should acquire write-lock before changing the inode map. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492942 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 03:14:10 +00:00
Suresh Srinivas 03b03e066c HDFS-4659. Merge r1477994 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492914 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 00:21:23 +00:00
Suresh Srinivas 4091026231 HDFS-3163. Merge r1338486 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492912 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-14 00:16:08 +00:00
Suresh Srinivas f79b53f7d5 HDFS-3792. Merge r1372690 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492894 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 22:56:08 +00:00
Suresh Srinivas bf81643485 HDFS-3009. Merge r1293390 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492892 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 22:45:54 +00:00
Suresh Srinivas e277c2a521 HDFS-2857. Merge r1238747 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492890 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 22:39:49 +00:00
Suresh Srinivas f5fa1fdb84 HDFS-2572. Merge r1204177 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492876 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 21:34:17 +00:00
Jing Zhao d1058249fb HDFS-4902. Merging changes r1492791 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492800 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-13 18:23:26 +00:00
Konstantin Shvachko 2c79780045 Port HDFS-4878 to branch-0.23.9. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492452 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 22:15:34 +00:00
Chris Nauroth 7f2848ba73 HADOOP-9638. Merging change r1492297 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492314 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 18:07:31 +00:00
Tsz-wo Sze d5d1b89645 svn merge -c 1492062 from trunk for HDFS-4819. Update Snapshot doc to clarify that nested snapshots are not allowed. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492064 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-12 05:44:39 +00:00
Jing Zhao 443578ccf7 HDFS-4873. Merging change r1491957 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491964 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-11 21:16:42 +00:00
Colin McCabe 68671e453b HADOOP-9635. Fix potential stack overflow in DomainSocket.c (V. Karthik Kumar via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491943 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-11 20:29:06 +00:00
Konstantin Shvachko 2a05c63004 HDFS-4878. On Remove Block, block is not removed from neededReplications queue. Contributed by Tao Luo. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491672 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-11 01:40:52 +00:00
Suresh Srinivas 401823e1ee HDFS-4752. Merge 1491631 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491633 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-10 22:41:22 +00:00
Konstantin Boudnik 6e9ad986eb Setting 2.0.5-alpha release date 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491137 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-09 04:51:28 +00:00
Ivan Mitic b134d65389 HDFS-4677. Merging change r1491096 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491101 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-08 23:49:26 +00:00
Kihwal Lee 27d3a51b56 svn merge -c 1490803 Merging from trunk to branch-2 to fix HDFS-4832. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490805 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 20:05:17 +00:00
Suresh Srinivas ae1c931095 HDFS-4880. Merge 1490746 fron trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490748 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 17:39:18 +00:00
Suresh Srinivas 2910b06dfa HDFS-4586. Merge r1455708 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490495 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 02:08:44 +00:00
Kihwal Lee f07af53a34 svn merge -c 1490486 Merging from trunk to branch-2 to fix HDFS-4862. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490487 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-07 01:18:27 +00:00
Konstantin Shvachko bbafbced87 HDFS-4867. metaSave NPEs when there are invalid blocks in repl queue. Contributed by Plamen Jeliazkov and Ravi Prakash. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490434 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 20:45:56 +00:00
Jing Zhao 3b08699b2c HDFS-4877. Merging change r1490421 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490430 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 20:29:05 +00:00
Tsz-wo Sze c2f9f05323 HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490117 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 03:35:03 +00:00
Suresh Srinivas a35a2ca335 HADOOP-8957. Merge r1420965 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490115 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-06 03:29:43 +00:00
Jing Zhao 5826b0c186 HDFS-4850. Merging change r1490080 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490084 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-05 23:42:11 +00:00
Thomas Graves ee792cf084 Updating release date for 0.23.8 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489902 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-05 15:01:24 +00:00
Tsz-wo Sze 267d7ca14e svn merge -c -1489709 for reverting HDFS-4876. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489875 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-05 13:53:12 +00:00
Tsz-wo Sze f974ce444d svn merge -c 1489708 from trunk for HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489709 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-05 05:27:58 +00:00
Aaron Myers 99faae2076 HDFS-4815. TestRBWBlockInvalidation: Double call countReplicas() to fetch corruptReplicas and liveReplicas is not needed. Contributed by Tian Hong Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489670 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 23:18:58 +00:00
Kihwal Lee eb0707983b svn merge -c 1489634 Merging from trunk to branch-2 to fix HDFS-4840. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489642 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 21:49:09 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 15:34:52 +00:00
Jason Darrell Lowe eb7af141e4 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489250 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-04 00:29:37 +00:00
Tsz-wo Sze 6bd7b27abf svn merge -c 1431726 from trunk for HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488856 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 06:13:53 +00:00
Tsz-wo Sze 4519131f77 svn merge -c 1430917 from trunk for HDFS-4261. Fix bugs in Balaner causing infinite loop and TestBalancerWithNodeGroup timeing out. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488855 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 06:11:22 +00:00
Tsz-wo Sze 8dd8c00fbb svn merge -c 1416691 from trunk for HDFS-4240. For nodegroup-aware block placement, when a node is excluded, he nodes in the same nodegroup should also be excluded. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488851 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 05:50:16 +00:00
Tsz-wo Sze 9b8d329e65 svn merge -c 1417130 from trunk for HDFS-4234. Use generic code for choosing datanode in Balancer. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488850 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 05:39:04 +00:00
Tsz-wo Sze 16995501d3 Merge r1414874 and r1414878 from trunk for HDFS-3495. Update Balancer to support new NetworkTopology with NodeGroup. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488848 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 05:28:34 +00:00
Tsz-wo Sze f8bb18770b svn merge -c 1357442 from trunk for HDFS-3601. Add BlockPlacementPolicyWithNodeGroup to support block placement with 4-layer network topology. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488845 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:59:48 +00:00
Tsz-wo Sze 4c734a8ee8 svn merge -c 1353807 from trunk for HDFS-3498. Support replica removal in BlockPlacementPolicy and make BlockPlacementPolicyDefault extensible for reusing code in subclasses. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488844 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:35:04 +00:00
Tsz-wo Sze 8ecc0ba26f svn merge -c 1351445 from trunk for HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation of NetworkTopology. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488839 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 04:05:41 +00:00
Tsz-wo Sze 1d520009e3 svn merge -c 1347867 from trunk for HADOOP-8469. Make NetworkTopology class pluggable. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488838 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-03 03:57:32 +00:00
Tsz-wo Sze 332cf8faeb svn merge -c 1488630 from trunk for moving HDFS-4826 to 2.1.0-beta. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488631 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 23:02:10 +00:00
Konstantin Boudnik 6e0b55c5b7 Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:41 +00:00
Konstantin Boudnik 44a72a119a Adding 2.0.5-alpha release to CHANGES.txt files of branch-2 
Also updating current version to 2.1.0-beta in the CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488585 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-01 20:06:32 +00:00
Tsz-wo Sze 360fa0c6f5 svn merge -c 1487942 from trunk for HDFS-4848. copyFromLocal and renaming a file to ".snapshot" should output hat ".snapshot" is a reserved name. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488097 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:16:05 +00:00
Tsz-wo Sze 6428612f35 svn merge -c 1487698 from trunk for HDFS-4863. The root directory should be added to the snapshottable directory list while loading fsimage. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488096 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:13:32 +00:00
Tsz-wo Sze 74fa2f1de8 svn merge -c 1487655 from trunk for HDFS-4857. Snapshot.Root and AbstractINodeDiff#snapshotINode should not be put into INodeMap when loading FSImage. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488094 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:10:06 +00:00
Tsz-wo Sze 387b7af02f svn merge -c 1487647 from trunk for HDFS-4846. Clean up snapshot CLI commands output stacktrace for invalid arguments. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488093 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:07:52 +00:00
Tsz-wo Sze ab2588a78b svn merge -c 1487643 from trunk for HDFS-4842. Identify the correct prior snapshot when deleting a snapshot under a renamed subtree. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488091 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 05:03:27 +00:00
Tsz-wo Sze 1b594395da svn merge -c 1483150 from trunk for HDFS-4826. TestNestedSnapshots times out due to repeated slow edit log flushes when running on virtualized disk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488090 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:50:10 +00:00
Tsz-wo Sze 82f91de0b6 Merge r1480838 and r1480840 from trunk for merging HDFS Snapshot feature. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488089 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-31 04:29:20 +00:00
Alejandro Abdelnur 8bb534f423 HDFS-4865. Remove sub resource warning from httpfs log at startup time. (ywskycn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487619 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-29 19:55:32 +00:00
Devaraj Das 0c221b3b03 Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487099 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 20:25:35 +00:00
Kihwal Lee 419fb4a4de svn merge -c 1486974 Merging from trunk to branch-2 to fix HDFS-4780. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486975 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-28 15:49:33 +00:00
Suresh Srinivas dbe14af299 HDFS-4825. Merge change 1486386 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486387 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-26 02:28:10 +00:00
Suresh Srinivas fa88e4ea6e HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-26 00:09:12 +00:00
Suresh Srinivas 1a895a3fd6 HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:29:49 +00:00
Suresh Srinivas baa2db4c64 HADOOP-8562. Merge r1477376 for HADOOP-9413, r1476877 for HDFS-4734, r1476856 for HADOOP-9524. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486238 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 22:20:55 +00:00
Suresh Srinivas 1e119f5c31 HDFS-4705. Merge r1476610 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486199 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 19:54:00 +00:00
Suresh Srinivas f05a2e5b69 HDFS-4722. Merge r1476597 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486176 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 19:16:58 +00:00
Suresh Srinivas c0fbc823f0 HDFS-4740. Merge r1476596 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486174 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 19:14:04 +00:00
Suresh Srinivas bc0eb9d993 HDFS-4743. Merge r1476591 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486162 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:45:39 +00:00
Suresh Srinivas 3694a73ff8 HADOOP-9290. Merge r1476586 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:37:58 +00:00
Suresh Srinivas 0610d2d2d3 HDFS-4741. Merge r1476585 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486151 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:29:50 +00:00
Suresh Srinivas 0af2735024 HDFS-3131. Merge r1305688 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486150 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:26:33 +00:00
Suresh Srinivas f1f11999d9 HDFS-4732. Merge r1471090 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486146 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:17:52 +00:00
Suresh Srinivas 4a16d5b759 HDFS-4725. Merge r1470771 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486144 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 18:15:42 +00:00
Suresh Srinivas a9176a64a1 HDFS-4693. Merge r1468457 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486098 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 15:44:33 +00:00
Suresh Srinivas 9b910c5c88 HADOOP-8562. Merge r1464780 HDFS-4625, r1465869 YARN-557, r1466148 HDFS-4674, r1466306 HADOOP-9437, r1466746 YARN-487 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485934 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 05:34:41 +00:00
Suresh Srinivas 0a96ae767f HADOOP-8562. Merge r1459586 for HDFS-4615, r1459592 for HDFS-4584, r1459643, r1459642 for HADOOP-9387, r1460086 for HADOOP-9353 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485932 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 05:12:56 +00:00
Suresh Srinivas 02205fa797 HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:51:31 +00:00
Suresh Srinivas a6c4b42353 HADOP-8662. Merge r1455637 for HADOOP-9388, r1455956 for HDFS-4593, r1456060 for HDFS-4582 and r1457057 for HDFS-4603 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485907 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-24 00:42:28 +00:00
Suresh Srinivas 830909a910 HADOOP-8562. Merge changes r1454616 for HDFS-4573, r1454889 for HADOOP-8973, r1455360 for HDFS-4572, r1455605 for HDFS-4287 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485892 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 22:51:30 +00:00
Kihwal Lee 7f66f9ccf6 HDFS-4714. Log short messages in Namenode RPC server for exceptions meant for clients. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485882 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 22:28:21 +00:00
Kihwal Lee 3f9b3d49a3 svn merge -c 1485861 Merging from trunk to branch-2 to fix HDFS-4807. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485863 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:37:32 +00:00
Suresh Srinivas 7ba49c56aa Merge changes r1453645 for HADOOP-9373, r1453675 for HADOOP-9376, r1453676 for HADOOP-9365, r1454108 for HADOOP-9364. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485853 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:17:38 +00:00
Suresh Srinivas 3eb800f539 HADOOP-9373. Merge change r1453599 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485850 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 21:07:05 +00:00
Suresh Srinivas a1235b5ba9 HADOOP-8562. Merge r1453486 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-23 20:41:53 +00:00
Aaron Myers e30e5becc2 HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485375 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 19:42:52 +00:00
Vinod Kumar Vavilapalli f71593ae2c MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1485085 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485086 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 06:37:01 +00:00
Kihwal Lee 623be287b7 HDFS-3875. Issue handling checksum errors in write pipeline. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484809 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 13:45:14 +00:00
Todd Lipcon 5fc2beed58 HDFS-4824. FileInputStreamCache.close leaves dangling reference to FileInputStreamCache.cacheCleaner. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483642 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-17 03:39:22 +00:00
Aaron Myers 815f2d7236 HDFS-4830. Typo in config settings for AvailableSpaceVolumeChoosingPolicy in hdfs-default.xml. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483604 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 23:23:48 +00:00
Aaron Myers 4069886102 HDFS-4787. Create a new HdfsConfiguration before each TestDFSClientRetries testcases. Contributed by Tian Hong Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483238 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 08:16:07 +00:00
Todd Lipcon f0c2f42b38 Add HDFS-347 and related JIRAs to CHANGES.txt under 2.0.5 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483213 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 07:10:46 +00:00
Todd Lipcon ba594d810e HDFS-4698. Provide client-side metrics for remote reads, local reads, and short-circuit reads. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483211 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 07:05:45 +00:00
Todd Lipcon e3021894e7 HDFS-4661. A few little code cleanups of some HDFS-347-related code. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483210 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 07:04:12 +00:00
Todd Lipcon 87a1e92453 HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483209 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 07:02:57 +00:00
Tsz-wo Sze bfd2074a57 svn merge -c 1482661 from trunk for HDFS-3180. Add socket timeouts to WebHdfsFileSystem. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482662 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 02:31:48 +00:00
Tsz-wo Sze 9ec6c9e018 svn merge -c 1482658 from trunk for HDFS-4813. Add volatile to BlocksMap.blocks so that the replication thread can see the updated value. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482659 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 02:19:24 +00:00
Kihwal Lee 3d615b6573 svn merge -c 1482121. Merging from trunk to branch-2 to fix HDFS-4805. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482122 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 22:06:55 +00:00
Aaron Myers 9c512f83d8 HDFS-4765. Permission check of symlink deletion incorrectly throws UnresolvedLinkException. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482013 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 18:13:44 +00:00
Aaron Myers 82c75115da HDFS-4300. TransferFsImage.downloadEditsToStorage should use a tmp file for destination. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481996 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 18:00:33 +00:00
Suresh Srinivas 2482e3270f HDFS-4533. Merge 1481178 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481211 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 21:54:27 +00:00
Aaron Myers f8b466a1f8 HADOOP-9485. No default value in the code for hadoop.rpc.socket.factory.class.default. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481208 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 21:49:58 +00:00
Aaron Myers bd816a2739 HDFS-4751. TestLeaseRenewer#testThreadName flakes. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481166 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 19:54:27 +00:00
Kihwal Lee d0ffad0387 svn merge -c 1481084. Merging from trunk to branch-2 to fix HDFS-4799. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481086 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 16:38:27 +00:00
Aaron Myers 211a9d99db HDFS-4810. several HDFS HA tests have timeouts that are too short. Contributed by Chris Nauroth 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480842 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-10 00:19:57 +00:00
Vinod Kumar Vavilapalli c175e3f4aa Fixing release date for 2.0.4-alpha. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480482 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 22:02:00 +00:00
Devaraj Das 0effce3ff0 HDFS-2576. Fixed some compilation issues. Affects only branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480151 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 03:12:58 +00:00
Devaraj Das 1dd166d72e Merge -r 1477848:1477849 from trunk onto branch-2. Fixes HDFS-4778. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480136 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 00:12:01 +00:00
Devaraj Das 471b37704a Merge -r 1476394:1476395 from trunk onto branch-2. Fixes HDFS-2576. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480135 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-08 00:05:18 +00:00
Aaron Myers 20fd61951b HDFS-4804. WARN when users set the block balanced preference percent below 0.5 or above 1.0. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480099 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-07 21:42:14 +00:00
Suresh Srinivas bd198d7dfe HDFS-4784. Merge r1478276 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478287 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:56:19 +00:00
Suresh Srinivas ab8ce0fcda HDFS-4785. Merge change r1478267 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478286 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:48:36 +00:00
Suresh Srinivas 78eaf8c3df HDFS-4434. Merge r1469644 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478282 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-02 06:35:58 +00:00
Aaron Myers a9c43af739 Move the CHANGES.txt entry for HDFS-4305 to the incompatible changes section. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477489 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-30 07:16:22 +00:00
Aaron Myers 0d10e7a16f HDFS-4305. Add a configurable limit on number of blocks per file, and min block size. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477358 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-29 21:41:52 +00:00
Suresh Srinivas f76ad1af85 HDFS-4748. Merge r1476587 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476588 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:32:49 +00:00
Suresh Srinivas 091e5df455 HDFS-4768. Merge 1476579 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476581 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 14:11:41 +00:00
Tsz-wo Sze b2927bd936 svn merge -c 1476399 from trunk for HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing he datanode with the most recent heartbeat as the primary. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476400 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-26 20:52:29 +00:00
Suresh Srinivas 14246f3d24 HDFS-4434. Reverting the merge to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475972 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 21:28:51 +00:00
Suresh Srinivas a51590e1c5 HDFS-4053. Merging change r1399908 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475848 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 16:44:59 +00:00
Suresh Srinivas e304090117 Cleanup CHANGES.txt to have consistent formatting and match the descrtion with CHANGES.txt in trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475780 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 14:04:12 +00:00
Suresh Srinivas 14f658bf38 HDFS-4745. Merge 1475623 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475625 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-25 04:32:51 +00:00
Aaron Myers 2838617e0a Update CHANGES.txt for HDFS-4739. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471775 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 23:32:50 +00:00
Aaron Myers a0e8dbbb19 HDFS-4739. NN can miscalculate the number of extra edit log segments to retain. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471773 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 23:32:13 +00:00
Suresh Srinivas 1efa9d84ab HDFS-4434. Merge r1469644 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471703 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 21:41:56 +00:00
Suresh Srinivas 7ca417037f HDFS-4340. Merge r1448502 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471698 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 21:35:47 +00:00
Suresh Srinivas 13df6b76d2 HDFS-4340. Merge r1443169 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471692 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 21:31:42 +00:00
Suresh Srinivas 2dbf0c2af5 HDFS-4243. Merge r1416709 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471603 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 19:21:05 +00:00
Suresh Srinivas 0dd2ca1389 HDFS-4346. Merge change r1428167 and r1428560 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471598 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:59:08 +00:00
Suresh Srinivas 9d7e92100b HDFS-4339. Merge change r1465835 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471596 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:42:14 +00:00
Suresh Srinivas 05dc1ca3a5 HDFS-4296. Merge r1420700 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471590 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:29:00 +00:00
Suresh Srinivas 2620203b1a HDFS-4334. Merge r1426429 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471582 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:20:09 +00:00
Suresh Srinivas 0b2af91bc6 HDFS-4209. Merge r1414447 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471574 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:16:25 +00:00
Suresh Srinivas c68bb9cb51 HDFS-4151. Merge r1406006 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471567 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 18:01:46 +00:00
Suresh Srinivas 19198ea31d HDFS-4215. Merge r1411947 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471530 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:46:50 +00:00
Suresh Srinivas 876c1c9098 HDFS-4206. Merge change r1410996 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471522 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:38:53 +00:00
Suresh Srinivas b2b151139c HDFS-4152. Merge r1406326 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471508 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:22:55 +00:00
Suresh Srinivas c5227bd362 Remove duplicate HDFS-4112 entries in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471503 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:14:51 +00:00
Suresh Srinivas 40aaaf000e HDFS-4124. Merge r1403304 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471500 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 16:10:59 +00:00
Suresh Srinivas 611b3fc5e6 HDFS-4129. Merge r1403956 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471433 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 14:28:58 +00:00
Aaron Myers 79de664f03 HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471216 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-24 00:48:23 +00:00
Kihwal Lee fbce046a88 svn merge -c 1469839 Merging from trunk to branch-2 to fix HDFS-4699. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469840 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-19 14:11:28 +00:00
Suresh Srinivas b3941c65e8 HDFS-4695. Merge 1469015 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469018 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-17 18:14:16 +00:00
Suresh Srinivas 16d41cabf9 HDFS-4693. Merge 1468457 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468469 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-16 15:39:20 +00:00
Konstantin Shvachko a59b953861 HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467535 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-13 01:36:46 +00:00