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

3849 Commits

Author SHA1 Message Date
Colin Patrick Mccabe 440379a0d4 HDFS-9549. TestCacheDirectives#testExceedsCapacity is flaky (Xiao Chen via cmccabe) 
(cherry picked from commit 211c78c090)
 2016-02-23 12:05:53 -08:00
Tsuyoshi Ozawa 56b82de6e1 HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS Web UI. (Contributed by Ravi Prakash) 
(cherry picked from commit 48c61cd6aa)
 2016-02-23 19:31:22 +09:00
Tsz-Wo Nicholas Sze 9b10373b2b HDFS-8578. On upgrade, Datanode should process all storage/data dirs in parallel. Contributed by vinayakumarb and szetszwo 2016-02-22 15:16:14 -08:00
Zhe Zhang 56b7f2c2c1 HADOOP-12668. Support excluding weak Ciphers in HttpServer2 through ssl-server.conf. Contributed by Vijay Singh. 
Change-Id: Ie46a5427d29188935427f67e55203c19fcd83335
 2016-02-22 14:14:39 -08:00
Arpit Agarwal fef99bcae0 HDFS-9842. dfs.datanode.balance.bandwidthPerSec should accept friendly size units. (Contributed by Lin Yiqun) 2016-02-22 11:34:17 -08:00
Vinayakumar B 2e3c35a835 HDFS-9425. Expose number of blocks per volume as a metric (Contributed by Brahma Reddy Battula) 
(cherry picked from commit 342c9572bf)
 2016-02-22 09:29:47 +05:30
Vinayakumar B 3e76768f21 HDFS-7452. skip StandbyException log for getCorruptFiles() (Contributed by Bramha Reddy Battula) 
(cherry picked from commit f313516731)
 2016-02-22 09:22:12 +05:30
Arpit Agarwal 7660cfd91a HDFS-9839. Reduce verbosity of processReport logging. (Contributed by Arpit Agarwal) 
This closes #78
 2016-02-20 23:20:18 -08:00
Yongjun Zhang b144e0f15d HDFS-9764. DistCp doesn't print value for several arguments including -numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit ba1c9d484a)
 2016-02-19 10:29:27 -08:00
Tsz-Wo Nicholas Sze 5faa2934e8 Move HDFS-8923 to Release 2.8.0 in CHANGES.txt. 2016-02-18 18:44:40 -08:00
Tsz-Wo Nicholas Sze 2a09f00ac3 HDFS-8923. Add -source flag to balancer usage message. Contributed by Chris Trezzo 2016-02-18 18:39:09 -08:00
Tsz-Wo Nicholas Sze 38fc086940 HADOOP-10865. Add a Crc32 chunked verification benchmark for both directly and non-directly buffer cases. 2016-02-18 12:02:00 -08:00
Kihwal Lee b83348c2e3 HDFS-4946. Allow preferLocalNode in BlockPlacementPolicyDefault to be configurable. Contributed by James Kinley and Nathan Roberts. 
(cherry picked from commit ba6d5ed955)
 2016-02-18 13:27:39 -06:00
cnauroth 779a69e28d HDFS-9711. Integrate CSRF prevention filter in WebHDFS. Contributed by Chris Nauroth. 
(cherry picked from commit 5d1889a66d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
 2016-02-18 10:09:33 -08:00
Akira Ajisaka c183f235f1 HDFS-6832. Fix the usage of 'hdfs namenode' command. Contributed by Manjunath Ballur. 
(cherry picked from commit e78d8e66f7)
 2016-02-19 01:35:43 +09:00
Xiaoyu Yao ad4fcd1f9f HDFS-8855. Webhdfs client leaks active NameNode connections. Contributed by Xiaobing Zhou. 
(cherry picked from commit fe5624b85d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java
 2016-02-17 16:05:07 -08:00
Zhe Zhang e226dbbc8a HDFS-9799. Reimplement getCurrentTrashDir to remove incompatibility. (zhz) 
Change-Id: I7834bcebffed38cb384db5395ddb8b6dd9e79a0b
 2016-02-17 13:31:48 -08:00
Andrew Wang c22aedac68 HDFS-9608. Disk IO imbalance in HDFS with heterogeneous storages. Contributed by Wei Zhou. 
(cherry picked from commit 3a23dc683c)
 2016-02-17 11:30:13 -08:00
Haohui Mai e7d1507e21 HDFS-9815. Move o.a.h.fs.Hdfs to hadoop-hdfs-client. Contributed by Vinayakumar B. 2016-02-17 10:56:57 -08:00
Junping Du 6874a142d8 HDFS-9456. BlockPlacementPolicyWithNodeGroup should override verifyBlockPlacement(). Contributed by Xiaobing Zhou. 
(cherry picked from commit 77ba5add0d)
 2016-02-16 19:00:52 -08:00
Akira Ajisaka 8dec72bfd7 HDFS-9765. TestBlockScanner#testVolumeIteratorWithCaching fails intermittently. (aajisaka) 
(cherry picked from commit 8ed07bd3e6)
 2016-02-15 19:08:35 +09:00
Akira Ajisaka 5e78264cde HDFS-9773. Remove dead code related to SimulatedFSDataset in tests. Contributed by Brahma Reddy Battula. 
(cherry picked from commit b0738ae673)
 2016-02-15 15:35:25 +09:00
Akira Ajisaka 75c5470165 HDFS-9691. TestBlockManagerSafeMode#testCheckSafeMode fails intermittently. Contributed by Mingliang Liu. 
(cherry picked from commit ac5da11399)
 2016-02-15 14:00:40 +09:00
Junping Du a28be9edc7 Set the release date for 2.6.4. 
(cherry picked from commit ec12ce8f48)
 2016-02-13 01:44:12 -08:00
Arpit Agarwal 63f51208a8 HDFS-9801. ReconfigurableBase should update the cached configuration. (Arpit Agarwal) 2016-02-12 12:41:12 -08:00
Jing Zhao f8c9c0ff0e HDFS-9754. Avoid unnecessary getBlockCollection calls in BlockManager. Contributed by Jing Zhao. 
(cherry picked from commit 972782d956)
 2016-02-12 11:40:28 -08:00
Arun Suresh f501c6dc49 HDFS-9797. Log Standby exceptions thrown by RequestHedgingProxyProvider at DEBUG Level (Inigo Goiri via asuresh) 
(cherry picked from commit 9fdfb546fb)
 2016-02-12 11:19:29 -08:00
Zhe Zhang 5e8be29ac9 HDFS-9644. Update encryption documentation to reflect nested EZs. (zhz) 
Change-Id: I84ae96f4711a16ded46d501c51ca322bfca5151d
 2016-02-12 10:46:51 -08:00
Masatake Iwasaki f71fa500f9 HDFS-9700. DFSClient and DFSOutputStream should set TCP_NODELAY on sockets for DataTransferProtocol (Gary Helmling via iwasakims) 
(cherry picked from commit 372d1302c6)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/DfsClientConf.java
 2016-02-13 03:32:58 +09:00
Akira Ajisaka a714d04f5d HDFS-9768. Reuse ObjectMapper instance in HDFS to improve the performance. Contributed by Lin Yiqun. 
(cherry picked from commit e6a7044b85)
 2016-02-13 02:04:01 +09:00
Arpit Agarwal 7f1d18fec6 HDFS-9790. HDFS Balancer should exit with a proper message if upgrade is not finalized (Contributed by Xiaobing Zhou) 2016-02-11 21:18:45 -08:00
Karthik Kambatla 383f3ff28c HDFS-9780. RollingFileSystemSink doesn't work on secure clusters. (Daniel Templeton via kasha) 
(cherry picked from commit 33ce7f6c07)
 2016-02-11 20:45:23 -08:00
Karthik Kambatla d3a0bb6d32 HDFS-9637. Tests for RollingFileSystemSink. Addendum patch to add missing file. 2016-02-11 20:41:06 -08:00
Karthik Kambatla ee4ace3edf HDFS-9637. Tests for RollingFileSystemSink. (Daniel Templeton via kasha) 2016-02-11 16:45:31 -08:00
Andrew Wang d489570755 HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. 
(cherry picked from commit aeb13ef2ab)
 2016-02-10 15:26:14 -08:00
Akira Ajisaka a60a0a7128 HDFS-9686. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta. 
(cherry picked from commit 802a7edfae)
 2016-02-10 23:50:04 +09:00
Akira Ajisaka 15ef3a85d9 Revert "HDFS-9686. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta." 
This reverts commit e4c01b8b1c.
 2016-02-10 23:45:15 +09:00
Uma Maheswara Rao G 04ecce1ca9 HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack value. Contributed by Kuhu Shukla. 
(cherry picked from commit a7fce9ab41)
 2016-02-09 15:16:53 -08:00
Allen Wittenauer 73b195eccc HDFS-9760. WebHDFS AuthFilter cannot be configured with custom AltKerberos auth handler (Ryan Sasson via aw) 2016-02-09 14:16:12 -08:00
Akira Ajisaka cb53dfcc95 HDFS-9784. Example usage is not correct in Transparent Encryption document. Contributed by Ohnishi Takashi. 
(cherry picked from commit 60d2011b7c)
 2016-02-10 03:30:44 +09:00
Walter Su ac856893e7 Move HDFS-9347 from 2.8.0 to 2.6.5 in CHANGES.txt. 2016-02-09 10:53:45 +08:00
zhezhang ef9a81e875 HDFS-9244. Support nested encryption zones. 
Change-Id: I43a13035a8b27956e90967ee82058efb647c3415
 2016-02-08 16:31:41 -08:00
Uma Maheswara Rao G 44a020ed81 HDFS-9777. Fix typos in DFSAdmin command line and documentation.(Wei-Chiu Chuang via umamahesh) 
(cherry picked from commit bffaa38a91)
 2016-02-08 14:00:47 -08:00
Kihwal Lee 494cfd1dc4 HDFS-9752. Permanent write failures may happen to slow writers during datanode rolling upgrades. Contributed by Walter Su. 
(cherry picked from commit 193d27de0a)
 2016-02-08 12:17:07 -06:00
Uma Maheswara Rao G 82d4b2cf27 HDFS-9713. DataXceiver#copyBlock should return if block is pinned. Contributed by Uma Maheswara Rao G. 
(cherry picked from commit aea31eee78)
 2016-02-07 20:55:58 -08:00
Akira Ajisaka e4c01b8b1c HDFS-9686. Remove useless boxing/unboxing code. Contributed by Kousuke Saruta. 
(cherry picked from commit fe124da5ff)
 2016-02-06 19:32:50 +09:00
cnauroth a7232f5e1d HDFS-9761. Rebalancer sleeps too long between iterations. Contributed by Mingliang Liu. 
(cherry picked from commit c6497949e8)
 2016-02-05 15:07:59 -08:00
Tsz-Wo Nicholas Sze 117397b89f HDFS-9726. Refactor IBR code to a new class. 2016-02-05 23:20:16 +08:00
Haohui Mai e62ca14856 HDFS-9724. Degraded performance in WebHDFS listing as it does not reuse ObjectMapper. Contributed by Akira Ajisaka. 2016-02-04 11:35:34 -08:00
Kihwal Lee e26c58fb4e HDFS-9730. Storage ID update does not happen when there is a layout change. Contributed by Tsz Wo Nicholas Sze. 
(cherry picked from commit 496f33de0c)
 2016-02-04 13:21:30 -06:00
Vinayakumar B 6ee66be2fa HDFS-9629. Update the footer of Web UI to show year 2016 (Contributed by Xiao Chen and Vinayakumar B) 
(cherry picked from commit ddcd6954d03d3caadc8b69f7b886a3a17c3c9d0c)
 2016-02-04 13:38:26 +05:30
Konstantin V Shvachko 4a0550537c HDFS-9503. Use generic option -fs for NNThroughputBenchmark instead of -namenode. Contributed by Mingliang Liu. 2016-02-03 14:51:41 -08:00
Konstantin V Shvachko 6d1f9a6b4c Move HDFS-9601 to branch-2.8.0 in CHANGES.txt. (shv) 2016-02-03 14:36:25 -08:00
Jing Zhao 459c31de4a HDFS-9748. Avoid duplication in pendingReplications when addExpectedReplicasToPending is called twice. Contributed by Walter Su. 
(cherry picked from commit 7badf15604)
 2016-02-03 13:32:19 -08:00
Vinayakumar B 6941e2ccbf HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() (Contributed by Chang Li) 
(cherry picked from commit eb2fb943fd)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
 2016-02-03 11:21:08 +05:30
Vinayakumar B e8a9a69a27 HDFS-9739. DatanodeStorage.isValidStorageId() is broken (Contributed by Mingliang Liu) 
(cherry picked from commit d6b1acb940)
 2016-02-03 10:33:55 +05:30
Vinayakumar B 8577c0b6a2 HDFS-9715. Check storage ID uniqueness on datanode startup (Contributed by Lei (Eddy) Xu) 
(cherry picked from commit 04375756a5)
 2016-02-03 07:35:47 +05:30
Junping Du 3583c77ee8 Adding release 2.6.5 to CHANGES.txt 2016-02-02 18:09:17 -08:00
Colin Patrick Mccabe 60d3a3c30b HDFS-9669. TcpPeerServer should respect ipc.server.listen.queue.size (Elliot Clark via cmccabe) 
(cherry picked from commit 2da03b48eb)
 2016-02-02 11:04:33 -08:00
Lei Xu 2f1d1c67f0 HDFS-9721. Allow Delimited PB OIV tool to run upon fsimage that contains INodeReference. (Xiao Chen via lei) 
(cherry picked from commit 9d494f0c0e)
 2016-02-02 10:42:24 -08:00
Vinayakumar B 80dd039b6e HDFS-9718. HAUtil#getConfForOtherNodes should unset independent generic keys before initialize (Contributed by DENG FEI) 
(cherry picked from commit 4d7055e0c8)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAConfiguration.java
 2016-02-02 12:56:31 +05:30
Yongjun Zhang fc8d9cc758 HDFS-9406. FSImage may get corrupted after deleting snapshot. (Contributed by Jing Zhao, Stanislav Antic, Vinayakumar B, Yongjun Zhang) 
(cherry picked from commit 34ab50ea92)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java
 2016-02-01 14:09:52 -08:00
Lei Xu d2f8e6c269 HDFS-9701. DN may deadlock when hot-swapping under load. (Xiao Chen via lei) 
(cherry picked from commit 12a4ebb4471f78b642e12c2ec0784c20f62cca3c)
 2016-02-01 12:56:00 -08:00
Xiaoyu Yao 7cc3b1c7a3 HDFS-9210. Fix some misuse of %n in VolumeScanner#printStats. Contributed by Xiaoyu Yao. 
(cherry picked from commit b11008d54d)
 2016-02-01 11:57:11 -08:00
Steve Loughran 7786e97df2 HDFS-9708. FSNamesystem.initAuditLoggers() doesn't trim classnames (Mingliang Liu via stevel) 2016-02-01 16:01:32 +00:00
Vinayakumar B 71374cca9d HDFS-9566. Remove expensive 'BlocksMap#getStorages(Block b, final DatanodeStorage.State state)' method (Contributed by Daryn Sharp) 
(cherry picked from commit e418bd1fb0)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
 2016-02-01 13:32:00 +05:30
Yongjun Zhang 2fb711bde9 HDFS-9638. Improve DistCp Help and documentation. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit eddd823cd6)
 2016-01-29 12:13:03 -08:00
Yongjun Zhang a24898fd49 HDFS-9706. Log more details in debug logs in BlockReceiver's constructor. (Xiao Chen via Yongjun Zhang) 
(cherry picked from commit 8ee060311c)
 2016-01-28 23:13:41 -08:00
Colin Patrick Mccabe dc65479fc0 HDFS-7764. DirectoryScanner shouldn't abort the scan if one directory had an error (Rakesh R via cmccabe) 
(cherry picked from commit f67149ab08)
 2016-01-28 20:12:18 -08:00
Tsz-Wo Nicholas Sze d37ecbf721 HDFS-9654. Code refactoring for HDFS-8578. 2016-01-28 10:56:39 +08:00
Tsz-Wo Nicholas Sze b10d8ced21 HDFS-8999. Allow a file to be closed with COMMITTED but not yet COMPLETE blocks. 2016-01-28 10:42:40 +08:00
Jing Zhao d7982222fa HDFS-9677. Rename generationStampV1/generationStampV2 to legacyGenerationStamp/generationStamp. Contributed by Mingliang Liu. 2016-01-27 15:51:10 -08:00
Zhe Zhang 2056dd7d3a HDFS-9541. Add hdfsStreamBuilder API to libhdfs to support defaultBlockSizes greater than 2 GB. Contributed by Colin Patrick McCabe. 
Change-Id: Ifce1b9be534dc8f7e9d2634cd60e423921b9810f
 2016-01-26 11:26:31 -08:00
Tsz-Wo Nicholas Sze c59c142f47 HDFS-9690. ClientProtocol.addBlock is not idempotent after HDFS-8071. 2016-01-26 14:56:23 +08:00
Jitendra Pandey 4334976187 HDFS-9672. o.a.h.hdfs.TestLeaseRecovery2 fails intermittently. Contributed by Mingliang Liu. 2016-01-25 17:06:36 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 97f6cfa94b Release process for 2.7.2: Set the release date for 2.7.2 
(cherry picked from commit ec4d2d9f40)
 2016-01-25 15:47:02 -08:00
Arpit Agarwal 0dbaef4377 HDFS-9094. Add command line option to ask NameNode reload configuration. (Contributed by Xiaobing Zhou) 2016-01-25 12:16:45 -08:00
Eric Yang da61953a0b HDFS-9653. Added blocks pending deletion report to dfsadmin. 
(Weiwei Yang via eyang)
 2016-01-24 14:26:46 -08:00
Kihwal Lee b5db1d4410 HDFS-8898. Create API and command-line argument to get quota and quota usage without detailed content summary. Contributed by Ming Ma. 2016-01-22 09:19:23 -06:00
Akira Ajisaka 4fe28a644e HDFS-9682. Fix a typo "aplication" in HttpFS document. Contributed by Weiwei yang. 
(cherry picked from commit 6831634682)
 2016-01-22 20:12:39 +09:00
Masatake Iwasaki 73ef77c12f HDFS-9618. Fix mismatch between log level and guard in BlockManager#computeRecoveryWorkForBlocks (iwasakims) 2016-01-22 14:12:06 +09:00
Masatake Iwasaki 245c3728ef HDFS-9601. NNThroughputBenchmark.BlockReportStats should handle NotReplicatedYetException on adding block (iwasakims) 2016-01-22 12:39:39 +09:00
Zhe Zhang 22caeb1c0a HDFS-9674. The HTrace span for OpWriteBlock should record the maxWriteToDisk time. Contributed by Colin McCabe. 
Change-Id: I9bf3f3bcd57f5880189ad7c160f3dd66f97d904b
 2016-01-21 13:26:54 -08:00
Jing Zhao c19bdc1926 HDFS-9542. Move BlockIdManager from FSNamesystem to BlockManager. Contributed by Jing Zhao. 
(cherry picked from commit c304890c8c)
 2016-01-21 11:37:24 -08:00
Kihwal Lee 3d8d8f1497 HDFS-9634. webhdfs client side exceptions don't provide enough details. Contributed by Eric Payne. 
(cherry picked from commit 7b70500484574a565dd8cd5c7d8b5bc7c6d91154)
 2016-01-21 09:33:30 -06:00
Vinayakumar B 845acfd96c HDFS-9625. set replication for empty file failed when set storage policy (Contributed by DENG FEI) 
(cherry picked from commit b7372b7166)
 2016-01-21 19:18:36 +05:30
Lei Xu c57f55223c HDFS-9655. NN should start JVM pause monitor before loading fsimage. (John Zhuge via Lei (Eddy) Xu) 
(cherry picked from commit 2ec438e8f7)
 2016-01-20 14:26:47 -08:00
Colin Patrick Mccabe c56044b9ee HDFS-9576: HTrace: collect position/length information on read operations (zhz via cmccabe) 
(cherry picked from commit 7905788db9)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
 2016-01-20 11:27:51 -08:00
Vinayakumar B 252bf56e59 HDFS-9661. Deadlock in DN.FsDatasetImpl between moveBlockAcrossStorage and createRbw (Contributed by ade) 
(cherry picked from commit 1425578690)
 2016-01-20 21:05:44 +05:30
Yongjun Zhang a5ee4c09de HDFS-6054. MiniQJMHACluster should not use static port to avoid binding failure in unit test. (Yongjun Zhang) 
(cherry picked from commit 57d0a94305)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/MiniQJMHACluster.java
 2016-01-19 23:13:46 -08:00
Akira Ajisaka 3a8d372518 HDFS-9623. Update example configuration of block state change log in log4j.properties. Contributed by Masatake Iwasaki. 
(cherry picked from commit 92c5f565fd)
 2016-01-19 13:31:48 +09:00
Tsz-Wo Nicholas Sze 87779a4478 In CHANGES.txt, move HDFS-9294 to Release 2.6.4. 2016-01-16 23:46:19 +08:00
Andrew Wang 46323d7744 HDFS-9624. DataNode start slowly due to the initial DU command operations. (Lin Yiqun via wang) 
(cherry picked from commit c07f7fa8ff)
 2016-01-15 11:28:55 -08:00
Yongjun Zhang ee012c1f6f HDFS-9612. DistCp worker threads are not terminated after jobs are done. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit a9c69ebeb7)
 2016-01-15 10:10:28 -08:00
Arpit Agarwal aadcaf4f32 HDFS-9415. Document dfs.cluster.administrators and dfs.permissions.superusergroup. (Contributed by Xiaobing Zhou) 2016-01-14 14:18:00 -08:00
Yongjun Zhang cfeecf113b HDFS-9648. TestStartup.testImageChecksum is broken by HDFS-9569's message change. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit 817cc1f02a)
 2016-01-14 12:45:18 -08:00
Junping Du 586efcf3c8 Move HDFS-8326 out of CHANGES.txt entry for branch-2.7.2. 2016-01-14 06:32:52 -08:00
Junping Du 62eabec549 Add missing CHANGES.txt entry for HDFS-8767. 
(cherry picked from commit e50dd19a9c)

Conflicts:

	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2016-01-14 06:13:02 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 1fba4051f8 HADOOP-5323. Trash documentation should describe its directory structure and configurations. (Weiwei Yang via ozawa) 
Moved entry from HDFS CHANGES.txt to that of common.

(cherry picked from commit cb73c753da)
 2016-01-13 14:56:08 -08:00
Yongjun Zhang 5e2416b901 HDFS-9569. Log the name of the fsimage being loaded for better supportability. (Yongjun Zhang) 
(cherry picked from commit 25051c3bd0)
 2016-01-12 09:24:54 -08:00