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

2637 Commits

Author SHA1 Message Date
Colin Patrick Mccabe 0c5069c432 HDFS-7996. After swapping a volume, BlockReceiver reports ReplicaNotFoundException (Lei (Eddy) Xu via Colin P. McCabe) 
(cherry picked from commit 023133cef9)
 2015-04-03 14:26:45 -07:00
cnauroth 28e0602e7b HDFS-8039. Fix TestDebugAdmin#testRecoverLease and testVerfiyBlockChecksumCommand on Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit db80e42891)
 2015-04-03 10:44:32 -07:00
cnauroth 0dde8c079d HDFS-8034. Fix TestDFSClientRetries#testDFSClientConfigurationLocateFollowingBlockInitialDelay for Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit dc5596c36a)
 2015-04-03 10:10:29 -07:00
Jing Zhao 2c1f33d178 HDFS-7811. Avoid recursive call getStoragePolicyID in INodeFile#computeQuotaUsage. Contributed by Xiaoyu Yao and Jing Zhao. 
(cherry picked from commit 72f6bd4893)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-04-02 21:22:43 -07:00
Haohui Mai 6e36dbf03a HDFS-8035. Move checkBlocksProperlyReplicated() in FSNamesystem to BlockManager. Contributed by Haohui Mai. 2015-04-02 11:38:02 -07:00
Tsz-Wo Nicholas Sze 81ed3a2bb8 HDFS-7954. TestBalancer#testBalancerWithPinnedBlocks should not be executed on Windows. Contributed by Xiaoyu Yao 2015-04-02 11:12:27 -07:00
Tsz-Wo Nicholas Sze ce3f32590d HDFS-7888. Change DFSOutputStream and DataStreamer for convenience of subclassing. Contributed by Li Bo 2015-04-02 11:00:47 -07:00
Vinayakumar B beb0fd0d60 HDFS-7916. 'reportBadBlocks' from datanodes to standby Node BPServiceActor goes for infinite loop (Contributed by Vinayakumar B) 
(cherry picked from commit 867d5d2675)
 2015-04-02 08:12:51 +05:30
Brandon Li 27970b3f46 HDFS-8001 RpcProgramNfs3 : wrong parsing of dfs.blocksize. Contributed by Remi Catherinot 
(cherry picked from commit 4d14816c26)
 2015-04-01 17:25:28 -07:00
Haohui Mai cfcf795492 HDFS-8008. Support client-side back off when the datanodes are congested. Contributed by Haohui Mai. 2015-04-01 16:54:53 -07:00
Haohui Mai 9e114ee607 HDFS-8036. Use snapshot path as source when using snapshot diff report in DistCp. Contributed by Jing Zhao. 2015-04-01 16:51:09 -07:00
Colin Patrick Mccabe 6f753da4a9 HDFS-7922. ShortCircuitCache#close is not releasing ScheduledThreadPoolExecutors (Rakesh R via Colin P. McCabe) 
(cherry picked from commit 3c7adaaf35)
 2015-04-01 16:11:44 -07:00
Colin Patrick Mccabe 4b74aa7182 HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than DFSOutputStream#writeChunk (cmccabe) 
(cherry picked from commit c94d594a57)
 2015-04-01 14:10:25 -07:00
Andrew Wang b17d8a53fa HDFS-7978. Add LOG.isDebugEnabled() guard for some LOG.debug(..). Contributed by Walter Su. 
(cherry picked from commit ed72daa5df)
 2015-04-01 12:54:46 -07:00
Haohui Mai a5bcfe0d33 HDFS-8009. Signal congestion on the DataNode. Contributed by Haohui Mai. 2015-04-01 10:57:07 -07:00
Akira Ajisaka b85bbca745 HDFS-6945. BlockManager should remove a block from excessReplicateMap and decrement ExcessBlocks metric when the block is removed. (aajisaka) 
(cherry picked from commit 18a91fe4df)
 2015-04-01 09:08:22 +09:00
Akira Ajisaka 7f6811ad73 HDFS-7671. hdfs user guide should point to the common rack awareness doc. Contributed by Kai Sasaki. 
(cherry picked from commit 859cab2f22)
 2015-04-01 00:26:54 +09:00
yliu e4cd67e9b0 HDFS-7997. The first non-existing xattr should also throw IOException. (zhouyingchao via yliu) 2015-03-31 21:16:13 +08:00
Arpit Agarwal 312e50f9c4 HDFS-7944. Minor cleanup of BlockPoolManager#getAllNamenodeThreads. (Arpit Agarwal) 2015-03-30 21:24:59 -07:00
Harsh J 32766b6563 HDFS-3918. EditLogTailer shouldn't log WARN when other node is in standby mode. Contributed by Todd Lipcon. 
(cherry picked from commit cce66ba3c9)
 2015-03-31 08:17:22 +05:30
Arpit Agarwal abf3ad988d HDFS-7645. Rolling upgrade is restoring blocks from trash multiple times (Contributed by Vinayakumar B and Keisuke Ogiwara) 2015-03-30 15:25:26 -07:00
Haohui Mai dd5b2dac5a HDFS-7748. Separate ECN flags from the Status in the DataTransferPipelineAck. Contributed by Anu Engineer and Haohui Mai. 2015-03-30 11:59:32 -07:00
Colin Patrick Mccabe 02ed22cd2d HDFS-7261. storageMap is accessed without synchronization in DatanodeDescriptor#updateHeartbeatState() (Brahma Reddy Battula via Colin P. McCabe) 
(cherry picked from commit 1feb9569f3)
 2015-03-30 10:53:57 -07:00
Akira Ajisaka d4bb9b2146 HDFS-8002. Website refers to /trash directory. Contributd by Brahma Reddy Battula. 
(cherry picked from commit e7ea2a8e8f)
 2015-03-31 00:28:27 +09:00
Kihwal Lee c4cedfc1d6 HDFS-7742. Favoring decommissioning node for replication can cause a block to stay 
underreplicated for long periods. Contributed by Nathan Roberts.
(cherry picked from commit 04ee18ed48)
 2015-03-30 10:11:25 -05:00
Harsh J c58357939f HDFS-4396. Add START_MSG/SHUTDOWN_MSG for ZKFC. Contributed by Liang Xie. 
(cherry picked from commit ae3e8c61ff)
 2015-03-30 15:22:57 +05:30
Vinayakumar B 9f49b3e93d HDFS-7890. Improve information on Top users for metrics in RollingWindowsManager and lower log level (Contributed by J.Andreina) 
(cherry picked from commit 1ed9fb7664)
 2015-03-30 10:04:11 +05:30
Akira Ajisaka 7aded71f3a HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by Abhiraj Butala. 
(cherry picked from commit 232eca944a)
 2015-03-30 11:26:11 +09:00
Akira Ajisaka a79a38d096 HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties. Contributed by Abhiraj Butala. 
(cherry picked from commit 257c77f895)
 2015-03-30 10:52:45 +09:00
Harsh J b679dc5a8e HDFS-7501. TransactionsSinceLastCheckpoint can be negative on SBNs. Contributed by Gautam Gopalakrishnan. 
(cherry picked from commit 3d9132d434)
 2015-03-29 00:46:22 +05:30
Arpit Agarwal d0bc2eff1a HDFS-7700. Document quota support for storage types. (Contributed by Xiaoyu Yao) 2015-03-27 19:49:33 -07:00
Arun Suresh dadda2edca HDFS-8004. Use KeyProviderCryptoExtension#warmUpEncryptedKeys when creating an encryption zone. (awang via asuresh) 
(cherry picked from commit e97f8e44af)
 2015-03-27 19:25:32 -07:00
Kihwal Lee 577ea08865 HDFS-7990. IBR delete ack should not be delayed. Contributed by Daryn Sharp. 
(cherry picked from commit 60882ab26d)
 2015-03-27 09:06:23 -05:00
Colin Patrick Mccabe 2a750c9aa6 HDFS-7410. Support CreateFlags with append() to support hsync() for appending streams (Vinayakumar B via Colin P. McCabe) 
(cherry picked from commit 61df1b27a7)
 2015-03-26 13:28:58 -07:00
Arpit Agarwal c035106c05 HDFS-7824. GetContentSummary API and its namenode implementation for Storage Type Quota/Usage. (Contributed by Xiaoyu Yao) 2015-03-26 10:47:43 -07:00
Kihwal Lee 071277b9ce HDFS-7963. Fix expected tracing spans in TestTracing. Contributed by Masatake Iwasaki. 2015-03-26 08:42:45 -05:00
Kihwal Lee be4eabdcd4 HDFS-7928. Scanning blocks from disk during rolling upgrade startup takes a lot of time if disks are busy. Contributed by Rushabh Shah. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 2015-03-25 14:51:00 -05:00
Jitendra Pandey 456cec127b HDFS-6826. Plugin interface to enable delegation of HDFS authorization assertions. Contributed by Arun Suresh. 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 2015-03-24 16:02:21 -07:00
Haohui Mai 161dae898f HDFS-7713. Implement mkdirs in the HDFS Web UI. Contributed by Ravi Prakash. 2015-03-24 15:49:08 -07:00
Jing Zhao 483f77b75b HDFS-7854. Separate class DataStreamer out of DFSOutputStream. Contributed by Li Bo. 
(cherry picked from commit a16bfff71b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2015-03-24 11:21:10 -07:00
Brandon Li 260dbe96c3 HDFS-7977. NFS couldn't take percentile intervals. Contributed by Brandon Li 
(cherry picked from commit 570a83ae80)
 2015-03-24 10:50:50 -07:00
Harsh J 608ad6c2cd HDFS-7875. Improve log message when wrong value configured for dfs.datanode.failed.volumes.tolerated. Contributed by Nijel. 
(cherry picked from commit 2da3d2ed2ff2e9b48dbda7e029aa58261c729d35)
 2015-03-24 23:03:56 +05:30
Brandon Li 95bde88986 HDFS-7976. Update NFS user guide for mount option 'sync' to minimize or avoid reordered writes. Contributed by Brandon Li 
(cherry picked from commit 51f1f49374)
 2015-03-24 10:29:27 -07:00
Andrew Wang e39c58fd9d HDFS-7961. Trigger full block report after hot swapping disk. Contributed by Eddy Xu. 
(cherry picked from commit 6413d34986)
 2015-03-24 09:07:24 -07:00
Vinayakumar B c3e2c20c99 HDFS-3325. When configuring 'dfs.namenode.safemode.threshold-pct' to a value greater or equal to 1 there is mismatch in the UI report (Contributed by J.Andreina) 
(cherry picked from commit c6c396fcd6)
 2015-03-24 12:13:21 +05:30
Plamen Jeliazkov 75d6d9e022 HDFS-7956. Improve logging for DatanodeRegistration. Contributed by Plamen Jeliazkov. 2015-03-23 23:07:01 -07:00
Andrew Wang 2f46ee50bd HDFS-7960. The full block report should prune zombie storages even if they're not empty. Contributed by Colin McCabe and Eddy Xu. 
(cherry picked from commit 50ee8f4e67)
 2015-03-23 22:00:44 -07:00
Tsz-Wo Nicholas Sze fe693b72de HDFS-7884. Fix NullPointerException in BlockSender when the generation stamp provided by the client is larger than the one stored in the datanode. Contributed by Brahma Reddy Battula 2015-03-24 13:51:31 +09:00
cnauroth 01c0bcb176 HDFS-7917. Use file to replace data dirs in test to simulate a disk failure. Contributed by Lei (Eddy) Xu. 
(cherry picked from commit 2c238ae4e0)
 2015-03-23 16:30:33 -07:00
Akira Ajisaka fad8c78173 HDFS-7881. TestHftpFileSystem#testSeek fails in branch-2. Contributed by Brahma Reddy Battula. 2015-03-24 06:24:29 +09:00
Brandon Li 503d8e4164 HDFS-7942. NFS: support regexp grouping in nfs.exports.allowed.hosts. Contributed by Brandon Li 
(cherry picked from commit 36af4a913c)
 2015-03-23 10:09:43 -07:00
Kihwal Lee 29642b33cb HDFS-6841. Use Time.monotonicNow() wherever applicable instead of Time.now(). Contributed by Vinayakumar B 
(cherry picked from commit 99a8dcd19528b265d4fda9ae09a17e4af52f2782)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/DatanodeInfo.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
 2015-03-20 14:05:02 -05:00
Jing Zhao 6be52e42a9 HDFS-7957. Truncate should verify quota before making changes. Contributed by Jing Zhao. 
(cherry picked from commit d368d3647a)
 2015-03-20 11:54:35 -07:00
Jing Zhao a3e16f414c HDFS-7829. Code clean up for LocatedBlock. Contributed by Takanobu Asanuma. 
(cherry picked from commit a6a5aae472)
 2015-03-20 10:51:06 -07:00
Yongjun Zhang 0a41b1bdca HDFS-7835. make initial sleeptime in locateFollowingBlock configurable for DFSClient. Contributed by Zhihai Xu. 
(cherry-picked from commit 15612313f5)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
 2015-03-20 09:25:59 -07:00
yliu 3fac95f48d HDFS-7962. Remove duplicated logs in BlockManager. (yliu) 2015-03-20 05:31:08 +08:00
yliu 90164ffd84 HDFS-7930. commitBlockSynchronization() does not remove locations. (yliu) 2015-03-19 23:24:55 +08:00
Kihwal Lee 2b9173059d HDFS-7932. Speed up the shutdown of datanode during rolling upgrade. Contributed by Kihwal Lee. 
(cherry picked from commit 61a4c7fc98)
 2015-03-19 12:28:36 -05:00
Vinayakumar B 786ba9784d HDFS.7849. Update documentation for enabling a new feature in rolling upgrade ( Contributed by J.Andreina ) 
(cherry picked from commit 5be5129d93)
 2015-03-19 19:06:47 +05:30
Kihwal Lee ceb39c1cc6 HDFS-7816. Unable to open webhdfs paths with "+". Contributed by Haohui Mai 
(cherry picked from commit e79be0ee12)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-03-19 08:03:47 -05:00
Vinayakumar B 25515d1421 HDFS-7867. Update action param from 'start' to 'prepare' in rolling upgrade ( Contributed by J.Andreina) Updated JIRA id. 
(cherry picked from commit 355e008ffb)
 2015-03-19 12:11:34 +05:30
Vinayakumar B 4527aa6f77 HDFS-7869. Update action param from 'start' to 'prepare' in rolling upgrade ( Contributed by J.Andreina) 
(cherry picked from commit 338b477ff7)
 2015-03-19 12:01:05 +05:30
Colin Patrick Mccabe 219eb22c15 HDFS-7929. inotify unable fetch pre-upgrade edit log segments once upgrade starts (Zhe Zhang via Colin P. McCabe) 
(cherry picked from commit 43b41f2241)
 2015-03-18 19:08:30 -07:00
Jing Zhao 5a5b244648 HDFS-7587. Edit log corruption can happen if append fails with a quota violation. Contributed by Jing Zhao. 
(cherry picked from commit c7c71cdba5)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2015-03-18 18:56:56 -07:00
Jing Zhao 6dcc79507d HDFS-7943. Append cannot handle the last block with length greater than the preferred block size. Contributed by Jing Zhao. 
(cherry picked from commit bee5a6a64a)
 2015-03-18 18:45:01 -07:00
Colin Patrick Mccabe 79c07bbaca HDFS-7054. Make DFSOutputStream tracing more fine-grained (cmccabe) 
(cherry picked from commit 8234fd0e10)
 2015-03-18 18:15:17 -07:00
Haohui Mai 8eb97ea14e HDFS-7945. The WebHdfs system on DN does not honor the length parameter. Contributed by Haohui Mai. 2015-03-18 16:19:57 -07:00
Arpit Agarwal ca629f4579 HDFS-7914. TestJournalNode#testFailToStartWithBadConfig fails when the default dfs.journalnode.http-address port 8480 is in use. (Contributed by Xiaoyu Yao) 2015-03-18 14:05:24 -07:00
Haohui Mai 572555c9f9 HDFS-7697. Mark the PB OIV tool as experimental. Contributed by Lei (Eddy) Xu. 2015-03-18 13:34:03 -07:00
Arpit Agarwal e7ceb434d0 Fix CHANGES.txt for HDFS-7722. 2015-03-18 12:52:50 -07:00
Arpit Agarwal 6b7cf6e096 HDFS-7951. Fix NPE for TestFsDatasetImpl#testAddVolumeFailureReleasesInUseLock on Linux. (Contributed by Xiaoyu Yao) 2015-03-18 12:46:09 -07:00
Arpit Agarwal 97341a4a1d HDFS-7950. Fix TestFsDatasetImpl#testAddVolumes failure on Windows. (Contributed by Xiaoyu Yao) 2015-03-18 12:35:35 -07:00
Arpit Agarwal a08b1b5703 HDFS-7948. TestDataNodeHotSwapVolumes#testAddVolumeFailures failed on Windows. (Contributed by Xiaoyu Yao) 2015-03-18 12:26:11 -07:00
Haohui Mai b547e6d6e0 HDFS-7953. NN Web UI fails to navigate to paths that contain #. Contributed by kanaka kumar avvaru. 2015-03-18 11:08:29 -07:00
Arpit Agarwal 7d0f84bd8d HDFS-7946. TestDataNodeVolumeFailureReporting NPE on Windows. (Contributed by Xiaoyu Yao) 2015-03-17 21:34:35 -07:00
Colin Patrick Mccabe 455d4aa8a1 HDFS-7940. Add tracing to DFSClient#setQuotaByStorageType (Rakesh R via Colin P. McCabe) 
(cherry picked from commit d8846707c5)
 2015-03-17 11:01:42 -07:00
Vinayakumar B 6ddb1bc857 HDFS-5356. MiniDFSCluster should close all open FileSystems when shutdown() (Contributed by Rakesh R) 
(cherry picked from commit 018893e81e)
 2015-03-17 15:34:48 +05:30
yliu 991ac04afc HDFS-7838. Expose truncate API for libhdfs. (yliu) 2015-03-17 07:24:20 +08:00
Harsh J cbb8858367 HDFS-2360. Ugly stacktrce when quota exceeds. (harsh) 
(cherry picked from commit 046521cd65)
 2015-03-17 10:28:52 +05:30
Konstantin V Shvachko 4568acaa62 HDFS-7886. Fix TestFileTruncate falures. Contributed by Plamen Jeliazkov and Konstantin Shvachko. 2015-03-16 12:55:16 -07:00
Colin Patrick Mccabe c71b54fa32 HDFS-7915. The DataNode can sometimes allocate a ShortCircuitShm slot and fail to tell the DFSClient about it because of a network error (cmccabe) 
(cherry picked from commit bc9cb3e271)
 2015-03-14 22:41:50 -07:00
Colin Patrick Mccabe f93a2dd94b Revert "HDFS-7915. The DataNode can sometimes allocate a ShortCircuitShm slot and fail to tell the DFSClient about it because of a network error (cmccabe)" (Jenkins didn't run yet) 
This reverts commit 7550052b85.
 2015-03-13 18:39:43 -07:00
Colin Patrick Mccabe 7550052b85 HDFS-7915. The DataNode can sometimes allocate a ShortCircuitShm slot and fail to tell the DFSClient about it because of a network error (cmccabe) 
(cherry picked from commit 5aa892ed48)
 2015-03-13 18:30:36 -07:00
Konstantin V Shvachko 8afbfed5d3 HDFS-2605. Remove redundant "Release 0.21.1" section from CHANGES.txt. Contributed by Allen Wittenauer. 2015-03-13 13:45:13 -07:00
Konstantin V Shvachko b199081f54 HDFS-7903. Cannot recover block after truncate and delete snapshot. Contributed by Plamen Jeliazkov. 2015-03-13 12:40:38 -07:00
Kihwal Lee 464271a5ed HDFS-7435. PB encoding of block reports is very inefficient. Contributed by Daryn Sharp. 
(cherry picked from commit d324164a51)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2015-03-13 14:36:34 -05:00
Brandon Li af80a98ace HDFS-7926. NameNode implementation of ClientProtocol.truncate(..) is not idempotent. Contributed by Tsz Wo Nicholas Sze 
(cherry picked from commit f446669afb)
 2015-03-13 10:43:46 -07:00
Colin Patrick Mccabe 7455412a24 HDFS-7722. DataNode#checkDiskError should also remove Storage when error is found. (Lei Xu via Colin P. McCabe) 
(cherry picked from commit b49c3a1813)
 2015-03-12 12:40:38 -07:00
Tsz-Wo Nicholas Sze 981a1fa815 HDFS-6833. DirectoryScanner should not register a deleting block with memory of DataNode. Contributed by Shinichi Yamashita 2015-03-13 02:27:37 +08:00
Akira Ajisaka 6c80a3d34a HDFS-7880. Remove the tests for legacy Web UI in branch-2. Contributed by Brahma Reddy Battula. 2015-03-12 10:41:34 +09:00
cnauroth 5e99b7cd2f HDFS-7491. Add incremental blockreport latency to DN metrics. Contributed by Ming Ma. 
(cherry picked from commit fb34f45727)
 2015-03-11 14:11:39 -07:00
Colin Patrick Mccabe eefca23e8c HDFS-7830. DataNode does not release the volume lock when adding a volume fails. (Lei Xu via Colin P. McCabe) 
(cherry picked from commit 5c1036d598)
 2015-03-10 19:45:18 -07:00
Akira Ajisaka 2d3c5507ce HDFS-6806. HDFS Rolling upgrade document should mention the versions available. Contributed by J.Andreina. 
(cherry picked from commit 82db3341bf)
 2015-03-10 11:23:06 +09:00
Jing Zhao c7105fcff0 HDFS-7898. Change TestAppendSnapshotTruncate to fail-fast. Contributed by Tsz Wo Nicholas Sze. 
(cherry picked from commit e43882e84a)
 2015-03-09 10:52:39 -07:00
Vinod Kumar Vavilapalli 8e6f8e9a04 Adding 2.8 section in CHANGES.txt 2015-03-08 20:26:57 -07:00
Chris Douglas 3bc4f3502a HDFS-7411. Change decommission logic to throttle by blocks rather 
than nodes in each interval. Contributed by Andrew Wang
 2015-03-08 18:32:20 -07:00
Brandon Li c8af3b2768 HDFS-6488. Support HDFS superuser in NFSv3 gateway. Contributed by Brandon Li 
(cherry picked from commit 0f8ecb1d0c)
 2015-03-06 15:22:20 -08:00
Haohui Mai ab251fd355 HDFS-7818. OffsetParam should return the default value instead of throwing NPE when the value is unspecified. Contributed by Eric Payne. 2015-03-06 14:26:47 -08:00
Jing Zhao 994dadb9ba HDFS-7885. Datanode should not trust the generation stamp provided by client. Contributed by Tsz Wo Nicholas Sze. 
(cherry picked from commit 24db0812be)
 2015-03-06 10:57:38 -08:00
Jing Zhao c5d52c7b52 HDFS-7855. Separate class Packet from DFSOutputStream. Contributed by Li Bo. 
(cherry picked from commit 952640fa4c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
 2015-03-05 11:11:08 -08:00