Commit Graph

1849 Commits

Author SHA1 Message Date
Chris Nauroth a6e3cbc7f3 HDFS-5638. Merging change r1576405 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576410 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 16:21:45 +00:00
Colin McCabe 1be546ff2b HDFS-6085. Improve CacheReplicationMonitor log messages a bit (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576195 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 06:25:27 +00:00
Andrew Wang 0f7d99268c HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576157 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:44:56 +00:00
Andrew Wang 0697a50337 Revert bad HDFS-3405 merge from trunk to retry
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576155 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:40:46 +00:00
Andrew Wang 1356761f0f HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576154 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:34:16 +00:00
Tsz-wo Sze 5d2252b6dc svn merge -c 1575452 from trunk for HDFS-6076. DataNode with SimulatedDataSet should not create DatanodeRegistration with namenode layout version and namenode node type.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576151 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:22:43 +00:00
Tsz-wo Sze a42d3356db svn merge -c 1575021 from trunk for HDFS-6060. NameNode should not check DataNode layout version
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576149 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:12:57 +00:00
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:37:46 +00:00
Chris Nauroth 946db612ed HDFS-6055. Merging change r1576095 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576098 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 21:47:45 +00:00
Jing Zhao 9fcbd9413f HDFS-6077. Merge change r1576076 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576077 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 20:50:40 +00:00
Andrew Wang 3826799270 HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576048 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 19:05:10 +00:00
Haohui Mai c3c267af8f Merge r1576035 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576036 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 18:18:52 +00:00
Colin McCabe bc927a10cf HDFS-6071. BlockReaderLocal does not return -1 on EOF when doing a zero-length read on a short file. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575799 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 02:48:11 +00:00
Arpit Agarwal 03f20f77e1 HDFS-6078. Merging r1575559 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575561 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 16:40:27 +00:00
Andrew Wang fd3e554ff0 HDFS-5064. Standby checkpoints should not block concurrent readers. Contributed by Aaron Twining Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575449 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 23:39:14 +00:00
Chris Nauroth e4ef7774b5 HDFS-5986. Merging change r1575384 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575385 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 19:45:24 +00:00
Chris Nauroth d9e52c379c HDFS-6069. Merging change r1575184 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575192 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 06:14:24 +00:00
Chris Nauroth d7ef2df14f HDFS-6063. Merging change r1575171 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575172 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 05:53:24 +00:00
Colin McCabe fca36dcb4e HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575110 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 01:19:05 +00:00
Colin McCabe a9acce33a7 HDFS-6067. TestPread.testMaxOutHedgedReadPool is flaky (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575101 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 23:48:44 +00:00
Haohui Mai aaedcd5c5d Merge r1575086 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575088 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 22:56:53 +00:00
Colin McCabe 68eab8c5b9 HDFS-6059. TestBlockReaderLocal fails if native library not available (ajisakaa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575000 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 18:53:12 +00:00
Haohui Mai 59b3646382 Merge r1574997 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574999 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 18:52:38 +00:00
Colin McCabe a9f2c50805 HDFS-6061. Allow dfs.datanode.shared.file.descriptor.path to contain multiple entries and fall back when needed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574798 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:26:26 +00:00
Haohui Mai 39b70d4e1f Merge r1574792 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574794 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:16:12 +00:00
Colin McCabe 6f2dd3a25a HDFS-6057. DomainSocketWatcher.watcherThread should be marked as a daemon thread (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574789 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:01:41 +00:00
Haohui Mai 94ac5ba669 Merge r1574716 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574717 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 23:12:22 +00:00
Aaron Myers a872bdcb60 HDFS-5898. Allow NFS gateway to login/relogin from its kerberos keytab. Contributed by Abin Shahab.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574696 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 22:30:45 +00:00
Haohui Mai b19da33481 Merge r1574683 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574685 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 21:53:04 +00:00
Brandon Li 5e096ccac7 HDFS-6044. Merging change r1574622 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574624 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 19:05:44 +00:00
Brandon Li b7c98f4912 HDFS-6043. Merging change r1574616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574620 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:53:59 +00:00
Jing Zhao d5da583bda HDFS-5167. Merge change r1574603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574608 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:24:09 +00:00
Haohui Mai ef56b13d05 Merge r1574270 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574271 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 00:30:12 +00:00
Colin McCabe ba862fc744 HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment changes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574256 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:41:28 +00:00
Michael Stack 9c18ac13c0 HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574206 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 21:11:52 +00:00
Jing Zhao 45f24de631 HDFS-6053. Fix TestDecommissioningStatus and TestDecommission in branch-2. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574178 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 19:29:04 +00:00
Colin McCabe 91d8ee4be7 HDFS-6046. add dfs.client.mmap.enabled (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573888 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:51:40 +00:00
Colin McCabe c1db6bf511 HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573885 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:35:57 +00:00
Chris Nauroth b44dfd6725 HDFS-6039. Merging change r1573879 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573881 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:15:56 +00:00
Haohui Mai 3a4469df97 Merge r1573694 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573696 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:42:22 +00:00
Colin McCabe 1754ca0b90 HDFS-5950. The DFSClient and DataNode should use shared memory segments to communicate short-circuit information (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573435 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 04:05:58 +00:00
Haohui Mai eff8ac4537 HDFS-5956. Merge change r1573078 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573081 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 21:10:23 +00:00
Arpit Agarwal d333ea34aa HDFS-5821. Merging r1573076 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573077 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 21:06:17 +00:00
Arpit Agarwal e0f27f3755 HADOOP-10285. Merging r1573052 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573063 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 20:35:44 +00:00
Aaron Myers 08735d92ed HDFS-6033. PBImageXmlWriter incorrectly handles processing cache directives. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573054 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:48:57 +00:00
Jing Zhao b10d601a54 Backport HDFS-4200 from trunk: Reduce the size of synchronized sections in PacketResponder.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573044 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:38:31 +00:00
Colin McCabe 66c4e5090c HDFS-6030. Remove an unused constructor in INode.java (yzhang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573034 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 18:52:46 +00:00
Jing Zhao d744a6d8fe HDFS-5339. Merge change r1573026 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573027 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 18:40:59 +00:00
Chris Nauroth 5551993c29 HDFS-6028. Merging change r1572753 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572758 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 22:16:52 +00:00
Chris Nauroth 0eb2d3355a HADOOP-10353. Merging change r1572679 and r1572680 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572682 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 19:03:58 +00:00
Tsz-wo Sze e54f4dcb5e svn merge -c 1572488 from trunk for HDFS-6025. Update findbugsExcludeFile.xml.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572489 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 10:00:08 +00:00
Chris Nauroth 90398cc601 HDFS-4685. Update CHANGES.txt in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572315 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 22:39:45 +00:00
Chris Nauroth 2244459186 HDFS-4685. Merge HDFS ACLs to branch-2. Merging changes r1569870, r1570466, r1570655, r1571573, r1571745, r1572142, r1572189 and r1572190 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572308 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 22:32:27 +00:00
Andrew Wang 39922a7b4c HDFS-3969. Small bug fixes and improvements for disk locations API. Contributed by Todd Lipcon and Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572287 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 21:57:10 +00:00
Jing Zhao abdb0ef402 HDFS-6018. Merge change r1572183 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572184 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 18:23:42 +00:00
Chris Nauroth af95bdd1ca HDFS-5936. Merging change r1572150 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572156 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 16:40:56 +00:00
Chris Nauroth c11a2df1e4 HDFS-6008. Merging change r1571881 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571883 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 00:33:20 +00:00
Chris Nauroth 4f08024f65 HDFS-6006. Merging change r1571813 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571815 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 20:27:43 +00:00
Jing Zhao 70707e613a HDFS-5939. Merge change r1571781 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571782 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 18:39:50 +00:00
Arpit Agarwal 596a196c1c HDFS-5922. Merging r1571542 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571543 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 02:18:06 +00:00
Michael Stack 5f3f90a640 HDFS-5776 Support 'hedged' reads in DFSClient (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571479 13f79535-47bb-0310-9956-ffa450edef68
2014-02-24 22:53:07 +00:00
Jing Zhao fc5238cd1f HDFS-5935. Merge change r1570663 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570664 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 18:57:41 +00:00
Chris Nauroth 0b217b4952 HDFS-5981. Merging change r1570468 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570470 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:46:50 +00:00
Andrew Wang 3be91de5fc HDFS-5988. Bad fsimage always generated after upgrade. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570431 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 02:53:44 +00:00
Jing Zhao 9bc374a0bf HDFS-5982. Merge change r1570395 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570398 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 00:17:04 +00:00
Brandon Li 368def7c60 Merging change r1570366 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570372 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 22:32:49 +00:00
Kihwal Lee 266a2aadf6 svn merge -c 1570252 meging from trunk to branch-2 to fix:HDFS-5962. Mtime and atime are not persisted for symbolic links.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570255 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 16:16:32 +00:00
Andrew Wang 7feb5bc8aa HDFS-5979. Typo and logger fix for fsimage PB code. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570071 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 03:27:14 +00:00
Arpit Agarwal 10e98ce6bb HDFS-5742. Merging r1570067 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570068 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 03:21:26 +00:00
Arpit Agarwal 01730690f3 HDFS-5483. Merging r1570040 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570041 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 01:44:36 +00:00
Arpit Agarwal bc56aae9dc HDFS-5868. Merging r1569978 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569982 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:42:03 +00:00
Arpit Agarwal df72553cba HDFS-5318. Merging r1569951 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569959 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:08:29 +00:00
Colin McCabe 287536ef9d HDFS-5973. add DomainSocket#shutdown method. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569952 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:01:49 +00:00
Kihwal Lee 6edf8860ef svn merge -c 1569789 merging from trunk to branch-2 to fix:HDFS-5961. OIV cannot load fsimages containing a symbolic link.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569790 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 15:30:34 +00:00
Colin McCabe 3aa93a1702 Update change description for HDFS-5953
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569580 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 01:06:05 +00:00
Jing Zhao d6ed3df506 HDFS-5893. Merge change r1569477 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569478 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 19:08:43 +00:00
Kihwal Lee 5c26966bb7 svn merge -c 1569391 merging from trunk to branch-2 to fix:HDFS-5803. TestBalancer.testBalancer0 fails.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569393 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 15:42:04 +00:00
Kihwal Lee 9da50ec5e6 svn merge -c 1569368. merging from trunk to branch-2 to fix:HDFS-5780. TestRBWBlockInvalidation times out intemittently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569369 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 14:55:19 +00:00
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
Suresh Srinivas 2ad9a8d8ff HDFS-5959. Merge r1569156 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569162 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 01:54:48 +00:00
Chris Nauroth 3151800acd HDFS-5942. Merging change r1569124 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569133 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 22:42:07 +00:00
Arpit Agarwal 18d0cc96bb HDFS-5698. Update CHANGES.txt in branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568584 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 01:32:48 +00:00
Arpit Agarwal f0e7b22059 HDFS-5759. Merging r1568578 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568581 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 01:27:12 +00:00
Andrew Wang 54d43e5b41 HDFS-5953. TestBlockReaderFactory fails in trunk. (Akira Ajisaka via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568569 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:52:59 +00:00
Arpit Agarwal d795cbd791 HDFS-5847. Merging r1567812 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568562 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:27:25 +00:00
Brandon Li fdbee9d53a HDFS-5716. Merging change r1568547 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568553 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:17:58 +00:00
Arpit Agarwal 9829487fff HDFS-5915. Merging r1566824 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568552 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:16:27 +00:00
Arpit Agarwal 25c508e425 HDFS-5698. Merge r1566359 from trunk for merging the 'Use protobuf to serialize / deserialize FSImage' feature
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568548 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:08:04 +00:00
Brandon Li bdb9562634 HDFS-5949. Merging change r1568536 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568537 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 22:17:34 +00:00
Arpit Agarwal d0f8a63073 HDFS-5948. Merging r1568532 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568533 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 22:00:13 +00:00
Andrew Wang be69bfc2f4 HDFS-3128. Unit tests should not use a test root in /tmp. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568527 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 21:29:36 +00:00
Jing Zhao 696859201f HDFS-5775. Merge change r1558599 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568451 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:47:59 +00:00
Jing Zhao 8f9e6d8fa0 HDFS-5768. Merge change r1558598 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568447 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:43:39 +00:00
Suresh Srinivas 73aa908be6 HDFS-5943. Merge 1568412 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568427 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:17:26 +00:00
Jing Zhao ced619c93e HDFS-5715 and HDFS-5726. Merge change r1556353 and r1556433 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568217 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 08:23:45 +00:00
Jing Zhao bac1ab80f0 HDFS-5632. Merge change r1550917 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568210 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:47:06 +00:00
Jing Zhao 7fb827fb1d HDFS-5647. Merge change r1548796 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568207 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:38:34 +00:00
Jing Zhao 99a661e449 HDFS-5554. Merge change r1548796 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568206 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:35:44 +00:00
Jing Zhao 418e152347 HDFS-5537. Merge change r1546184 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568204 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:18:58 +00:00
Jing Zhao ccdeeb39e1 HDFS-5286. Merge change r1545768 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568203 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:13:02 +00:00