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

3917 Commits

Author SHA1 Message Date
Ravi Prakash 51b7d8935a HDFS-9953. Download File from UI broken after pagination. Contributed by Brahma Reddy Battula 2016-03-14 14:32:42 -07:00
Chris Nauroth dd462bc32f HDFS-9941. Do not log StandbyException on NN, other minor logging fixes. Contributed by Arpit Agarwal. 
(cherry picked from commit 5644137ada)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockUnderConstructionFeature.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
 2016-03-14 09:55:27 -07:00
Arpit Agarwal b0ea50bb29 HDFS-1477. Support reconfiguring dfs.heartbeat.interval and dfs.namenode.heartbeat.recheck-interval without NN restart. (Contributed by Xiaobing Zhou) 2016-03-10 19:05:22 -08:00
Colin Patrick Mccabe 710811652c HDFS-9933. ReverseXML should be capitalized in oiv usage message (cmccabe) 
(cherry picked from commit 79961ecea8)
 2016-03-10 13:45:02 -08:00
Colin Patrick Mccabe c82d1e1187 HDFS-9934. ReverseXML oiv processor should bail out if the XML file's layoutVersion doesn't match oiv's (cmccabe) 
(cherry picked from commit bd49354c6d)
 2016-03-10 13:41:32 -08:00
Colin Patrick Mccabe b8b580e6b8 HDFS-9927. Document the new OIV ReverseXML processor (Wei-Chiu Chuang via cmccabe) 
(cherry picked from commit 500875dfcc)
 2016-03-10 13:39:20 -08:00
Allen Wittenauer 9f4b3eaac0 Revert "HADOOP-12366. expose calculated paths (aw)" 
This reverts commit 45bb467918.
 2016-03-09 09:59:19 -08:00
Chris Nauroth 38a031ce68 HADOOP-12905. Clean up CHANGES.txt RAT exclusions from pom.xml files. Contributed by Chris Nauroth. 
(cherry picked from commit 89b16d27e2)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/pom.xml
	hadoop-mapreduce-project/pom.xml
 2016-03-08 21:22:57 -08:00
Arpit Agarwal 9d67f98e05 HDFS-9882. Add heartbeatsTotal in Datanode metrics. (Contributed by Hua Liu) 2016-03-07 21:10:34 -08:00
Akira Ajisaka fe0009a2bd HDFS-9812. Streamer threads leak if failure happens when closing DFSOutputStream. Contributed by Lin Yiqun. 
(cherry picked from commit 352d299cf8)
 2016-03-08 10:55:59 +09:00
Arpit Agarwal 3e987446e3 HDFS-9906. Remove spammy log spew when a datanode is restarted. (Contributed by Brahma Reddy Battula) 2016-03-07 12:20:07 -08:00
Masatake Iwasaki 135ceb6c7b HDFS-9865. TestBlockReplacement fails intermittently in trunk (Lin Yiqun via iwasakims) 
(cherry picked from commit d718fc1ee5)
 2016-03-08 02:11:07 +09:00
Harsh J ed421cb128 HDFS-9521. TransferFsImage.receiveFile should account and log separate times for image download and fsync to disk. Contributed by Wellington Chevreuil 
(cherry picked from commit fd1c09be3e)
 2016-03-07 17:23:11 +05:30
Chris Nauroth 592f161e13 HDFS-9239. DataNode Lifeline Protocol: an alternative protocol for reporting DataNode liveness. Contributed by Chris Nauroth. 
(cherry picked from commit 2759689d7d)
 2016-03-04 15:30:28 -08:00
Yongjun Zhang 1d6c9486a4 HDFS-9889. Update balancer/mover document about HDFS-6133 feature. Contributed by Yongjun Zhang. 
(cherry picked from commit 8e08861a14)
 2016-03-04 13:28:10 -08:00
Masatake Iwasaki 722182fdfb HADOOP-12470. In-page TOC of documentation should be automatically generated by doxia macro (iwasakims) 
(cherry picked from commit cbd31328a6)

 Conflicts:
	hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
	hadoop-common-project/hadoop-common/src/site/markdown/UnixShellGuide.md
 2016-03-04 14:12:44 +09:00
Andrew Wang 670944810c HADOOP-11792. Remove all of the CHANGES.txt files. 2016-03-03 21:02:58 -08:00
Masatake Iwasaki 8095c612a3 HDFS-9048. DistCp documentation is out-of-dated (Daisuke Kobayashi via iwasakims) 
(cherry picked from commit 33a412e8a4)
 2016-03-03 18:57:41 +09:00
Masatake Iwasaki 69e024f8fa HADOOP-12793. Write a new group mapping service guide (Wei-Chiu Chuang via iwasakims) 
(cherry picked from commit f70e317ccc)
 2016-03-03 17:14:53 +09:00
Arpit Agarwal 7b4a1001ea HDFS-9534. Add CLI command to clear storage policy from a path. (Contributed by Xiaobing Zhou) 2016-03-02 18:35:38 -08:00
Colin Patrick Mccabe 5998b20d63 HDFS-9835. OIV: add ReverseXML processor which reconstructs an fsimage from an XML file (cmccabe) 
(cherry picked from commit 700b0e4019)
 2016-03-02 18:18:45 -08:00
Zhe Zhang b97ac02c4b HDFS-9886. Configuration properties for hedged read is broken. Contributed by Akira AJISAKA. 2016-03-02 10:27:09 -08:00
Xiaoyu Yao 6bffe1a908 HDFS-9887. WebHdfs socket timeouts should be configurable. Contributed by Austin Donnelly and Chris Douglas. 
(cherry picked from commit 5abf051249)
 2016-03-02 09:24:46 -08:00
Akira Ajisaka 463ec6fa8c HDFS-9851. NameNode throws NPE when setPermission is called on a path that does not exist. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 27e0681f28)
 2016-03-02 14:43:49 +09:00
Akira Ajisaka e840141726 HDFS-9766. TestDataNodeMetrics#testDataNodeTimeSpend fails intermittently. Contributed by Xiao Chen. 
(cherry picked from commit 81fbc40f084eab85750cc7d4cc967d43d70d8333)
 2016-03-02 14:14:27 +09:00
Andrew Wang 81b7b9de27 HDFS-9881. DistributedFileSystem#getTrashRoot returns incorrect path for encryption zones. 
(cherry picked from commit 4abb2fa687)
 2016-03-01 16:35:43 -08:00
Kihwal Lee bcbff207d6 HDFS-9880. TestDatanodeRegistration fails occasionally. Contributed by Kihwal Lee. 
(cherry picked from commit e76b13c415)
 2016-03-01 17:01:37 -06:00
Kihwal Lee a823c30a9b HDFS-8791. block ID-based DN storage layout can be very slow for datanode on ext4. Contributed by Chris Trezzo. 
(cherry picked from commit b8dbffbef87c0ee0bee5e17649586fc9f0e1f55b)
 2016-03-01 15:03:32 -06:00
Chris Nauroth 6659d13f12 HDFS-9870. Remove unused imports from DFSUtil. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 2137e8feeb)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2016-03-01 11:16:21 -08:00
Jing Zhao 3cb7ae11a8 HDFS-7964. Add support for async edit logging. Contributed by Daryn Sharp. 
(cherry picked from commit 2151716832)
 2016-02-29 15:45:23 -08:00
Akira Ajisaka 531a081b01 HDFS-9864. Correct reference for RENEWDELEGATIONTOKEN and CANCELDELEGATIONTOKEN in webhdfs doc. Contributed by Brahma Reddy Battula. 
(cherry picked from commit 056f9013122dc3f0effc62d620261c312dd7f8ed)
 2016-02-29 18:42:35 +09:00
Tsz-Wo Nicholas Sze 7b79567cf9 HDFS-9710. DN can be configured to send block receipt IBRs in batches. 2016-02-26 15:34:00 -08:00
Xiaoyu Yao 1513c0179e HDFS-9831. Document webhdfs retry configuration keys introduced by HDFS-5219/HDFS-5122. Contributed by Xiaobing Zhou. 2016-02-26 14:24:03 -08:00
Kihwal Lee 03afcdd39d HDFS-9855. Modify TestAuditLoggerWithCommands to workaround the absence of HDFS-8332. Contributed by Kuhu Shukla. 2016-02-26 10:22:27 -06:00
Karthik Kambatla 6722e17f6d HDFS-9858. RollingFileSystemSink can throw an NPE on non-secure clusters. (Daniel Templeton via kasha) 
(cherry picked from commit c2460dad64)
 2016-02-25 16:36:07 -08:00
Chris Nauroth 4892f6a0eb HDFS-9843. Document distcp options required for copying between encrypted locations. Contributed by Xiaoyu Yao. 
(cherry picked from commit dbbfc58c33)
 2016-02-24 15:16:13 -08:00
cnauroth 59cd23e279 HDFS-9854. Log cipher suite negotiation more verbosely. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit d1dd248b75)
 2016-02-24 12:11:44 -08:00
Kihwal Lee 83f7f62be3 HDFS-9395. Make HDFS audit logging consistant. Contributed by Kuhu Shukla. 
(cherry picked from commit d27d7fc72e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 2016-02-24 12:08:43 -06:00
Zhe Zhang 9ecb71f92c HDFS-9844. Correct path creation in getTrashRoot to handle root dir. 
Change-Id: I5afe6c7176063892e3e632698c849bd9f4b92906
 2016-02-23 13:30:21 -08:00
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