Commit Graph

3413 Commits

Author SHA1 Message Date
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
Jing Zhao 313f03bfda HDFS-9621. Consolidate FSDirStatAndListingOp#createFileStatus to let its INodesInPath parameter always include the target INode. Contributed by Jing Zhao. 2016-01-11 22:48:36 -08:00
Xiaoyu Yao c5f63e637a Correct commit message for HDFS-9584
(cherry picked from commit 103d3cfc4e)
2016-01-11 19:00:17 -08:00
Xiaoyu Yao 521f60c094 HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore.
(cherry picked from commit c2e2e13455)
2016-01-11 17:12:43 -08:00
Arpit Agarwal 68a32a79b5 HDFS-9639. Inconsistent Logging in BootstrapStandby. (Contributed by Xiaobing Zhou) 2016-01-11 15:09:43 -08:00
Zhe Zhang 17dfa04be6 HDFS-9630. DistCp minor refactoring and clean up. Contributed by Kai Zheng.
Change-Id: I363c4ffcac32116ddcdc0a22fac3db92f14a0db0

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2016-01-11 09:53:20 -08:00
Lei Xu 699d420497 HDFS-9493. Test o.a.h.hdfs.server.namenode.TestMetaSave fails in trunk. (Tony Wu via lei)
(cherry picked from commit fd8065a763)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
2016-01-08 15:10:41 -08:00
Zhe Zhang 40dabae236 HDFS-9626. TestBlockReplacement#testBlockReplacement fails occasionally. Contributed by Xiao Chen.
Change-Id: I5cee398dfc361121d8b666ffd1203cc14a4ace24
2016-01-08 13:19:14 -08:00
Kihwal Lee 8d04b7c272 HDFS-9574. Reduce client failures during datanode restart. Contributed by Kihwal Lee.
(cherry picked from commit 38c4c14472)
2016-01-08 11:15:12 -06:00
Vinayakumar B 08f39bd5d1 HDFS-9619. SimulatedFSDataset sometimes can not find blockpool for the correct namenode (Contributed by Wei-Chiu Chuang)
(cherry picked from commit 6702e7d66a)
2016-01-07 14:20:39 +05:30
Vinayakumar B aa710bd461 HDFS-9600. do not check replication if the block is under construction (Contributed by Phil Yang)
(cherry picked from commit 34cd7cd765)
2016-01-07 11:30:57 +05:30
Haohui Mai 71006d5c22 HDFS-9047. Retire libwebhdfs. Contributed by Haohui Mai. 2016-01-06 16:13:43 -08:00
Arpit Agarwal 2e6990cdf2 HDFS-9498. Move code that tracks blocks with future generation stamps to BlockManagerSafeMode. (Contributed by Mingliang Liu) 2016-01-06 10:44:51 -08:00
Haohui Mai 150c9a80ee HDFS-9605. Add links to failed volumes to explorer.html in HDFS Web UI. Contributed by Archana T. 2016-01-05 13:56:08 -08:00
Haohui Mai 79dc184224 HDFS-7779. Support changing ownership, group and replication in HDFS Web UI. Contributed by Ravi Prakash. 2016-01-05 13:44:40 -08:00
Akira Ajisaka 247ab92464 Set release date for 2.6.3
(cherry picked from commit db99e30f67)
2016-01-04 16:12:52 +09:00
cnauroth 1f8162b74e HDFS-7553. fix the TestDFSUpgradeWithHA due to BindException. Contributed by Xiao Chen. 2015-12-29 10:57:24 -08:00
Kihwal Lee 131260f0a7 HDFS-7163. WebHdfsFileSystem should retry reads according to the configured retry policy. Contributed by Eric Payne.
(cherry picked from commit 867048c3e4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
2015-12-22 14:19:12 -06:00
cnauroth 9b039a5004 HDFS-9458. TestBackupNode always binds to port 50070, which can cause bind failures. Contributed by Xiao Chen.
(cherry picked from commit 5c0ff69618)
2015-12-22 10:29:40 -08:00
Colin Patrick Mccabe a56c5ef636 HDFS-9589. Block files which have been hardlinked should be duplicated before the DataNode appends to the them (cmccabe)
(cherry picked from commit bb540ba85a)
2015-12-22 09:37:30 -08:00
Akira Ajisaka 12caea3274 Move HDFS-8914 from 2.8.0 to 2.7.3 in CHANGES.txt.
(cherry picked from commit 2cb5afffc4)
2015-12-21 21:53:44 +09:00
Akira Ajisaka 7526a2a005 HDFS-9505. HDFS Architecture documentation needs to be refreshed. Contributed by Masatake Iwasaki.
(cherry picked from commit fa544020f6)
2015-12-21 21:23:28 +09:00
Zhe Zhang 223b47b398 HDFS-9347. Invariant assumption in TestQuorumJournalManager.shutdown() is wrong. Contributed by Wei-Chiu Chuang.
Change-Id: Idde8522e11c77f82b376e0c90a9bf33d163d5cb9
2015-12-18 16:05:21 -08:00
Colin Patrick Mccabe 31d2fb91fc HDFS-9350. Avoid creating temprorary strings in Block.toString() and getBlockName() (Staffan Friberg via cmccabe)
(cherry picked from commit e63388fdf2)
2015-12-18 10:05:12 -08:00
Andrew Wang 71fb205735 HDFS-8477. describe dfs.ha.zkfc.port in hdfs-default.xml. Contributed by Kanaka Kumar Avvaru.
(cherry picked from commit 058cfddebb)
2015-12-18 09:14:23 -08:00
Vinayakumar B c887bcd1f0 HDFS-9393. After choosing favored nodes, choosing nodes for remaining replicas should go through BlockPlacementPolicy (Contributed by J.Andreina)
(cherry picked from commit bfadf11b36)
2015-12-18 11:39:46 +05:30
cnauroth 7e5306e795 HDFS-9571. Fix ASF Licence warnings in Jenkins reports. Contributed by Brahma Reddy Battula.
(cherry picked from commit 6da9deec20)
2015-12-17 16:26:08 -08:00
Kihwal Lee 3c0ae5914c HDFS-9533. seen_txid in the shared edits directory is modified during bootstrapping. Contributed by Kihwal Lee.
(cherry picked from commit 5cb1e0118b)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestBootstrapStandby.java
2015-12-17 17:23:06 -06:00
cnauroth 294d0f6f6a HDFS-9572. Prevent DataNode log spam if a client connects on the data transfer port but sends no data. Contributed by Chris Nauroth
(cherry picked from commit 03bab8dea1)
2015-12-17 14:05:05 -08:00
Arpit Agarwal c0733db768 HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized reference. (Contributed by Wei-Chiu Chuang) 2015-12-17 13:57:12 -08:00
cnauroth a40ff6d4fb Revert "HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang."
This reverts commit 03e10f1fb3.
2015-12-17 13:53:25 -08:00
Allen Wittenauer a5c74cd921 HDFS-9570. Minor typos, grammar, and case sensitivity cleanup in HdfsPermissionsGuide.md's (Travis Campbell via aw)
(cherry picked from commit 8d278d8d2e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-12-17 11:40:58 -08:00
cnauroth 940026fc6b HDFS-9552. Document types of permission checks performed for HDFS operations. Contributed by Chris Nauroth.
(cherry picked from commit 724e71f63b)
2015-12-17 10:43:54 -08:00
Arpit Agarwal 0c1d1e311c HDFS-9565. TestDistributedFileSystem.testLocatedFileStatusStorageIdsTypes is flaky due to race condition. (Contributed by Wei-Chiu Chuang) 2015-12-17 10:37:58 -08:00
Kihwal Lee 03e10f1fb3 HDFS-9569. Log the name of the fsimage being loaded for better supportability. Contributed by Yongjun Zhang.
(cherry picked from commit eb6939cea0)
2015-12-17 10:30:58 -06:00
Konstantin V Shvachko 3d0222eafd Update CHANGES.txt to move HDFS-9516 to 2.7.3 section. 2015-12-16 23:24:34 -08:00
Uma Mahesh 3be39d0229 HDFS-9198. Coalesce IBR processing in the NN. (Daryn Sharp via umamahesh)
(cherry picked from commit f741476146)
2015-12-16 22:04:19 -08:00
Uma Mahesh e82135df87 Revert this commit as there is compilation issue with this patch in branch-2 "HDFS-9198. Coalesce IBR processing in the NN. (Daryn Sharp via umamahesh)"
This reverts commit 991ce3d630.
2015-12-16 19:18:30 -08:00
Uma Mahesh 991ce3d630 HDFS-9198. Coalesce IBR processing in the NN. (Daryn Sharp via umamahesh)
(cherry picked from commit f741476146)
2015-12-16 18:25:29 -08:00
Andrew Wang c7cb29defe HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey. Contributed by Daniel Templeton.
(cherry picked from commit 3c0adac88c)
2015-12-16 16:21:16 -08:00
cnauroth e8e3737ce8 HDFS-9557. Reduce object allocation in PB conversion. Contributed by Daryn Sharp.
(cherry picked from commit c470c8953d)
2015-12-16 11:11:27 -08:00
Andrew Wang 2796c1099f HDFS-8894. Set SO_KEEPALIVE on DN server sockets. Contributed by Kanaka Kumar Avvaru.
(cherry picked from commit 49949a4bb0)
2015-12-15 14:39:04 -08:00
Jing Zhao e0abb0a4e7 HDFS-9371. Code cleanup for DatanodeManager. Contributed by Jing Zhao.
(cherry picked from commit 8602692338)
2015-12-15 11:02:04 -08:00
Plamen Jeliazkov 15124c86d8 HDFS-9516. Truncate file fails with data dirs on multiple disks. Contributed by Plamen Jeliazkov. 2015-12-15 00:39:42 -08:00
Lei Xu 6df45118e5 Revert "Revert "HDFS-8860. Remove unused Replica copyOnWrite code (Lei (Eddy) Xu via Colin P. McCabe)""
This reverts commit fb909554a8.
2015-12-14 11:26:32 -08:00
Jing Zhao e02ad5a618 HDFS-9535. Newly completed blocks in IBR should not be considered under-replicated too quickly. Contributed by Mingliang Liu.
(cherry picked from commit e534569814)
2015-12-14 11:18:28 -08:00
Lei Xu 0852d3562a HDFS-9281. Change TestDeleteBlockPool to not explicitly use File to check block pool existence. (lei)
(cherry picked from commit db975af5fae506eb3d586bd9201f76adb3fd1281)
2015-12-14 11:01:48 -08:00
Yongjun Zhang be167d0154 HDFS-9514. TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing; exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang)
(cherry picked from commit bf5295b118)
2015-12-11 20:56:58 -08:00
Yongjun Zhang 3fc9593318 HDFS-9519. Some coding improvement in SecondaryNameNode#main. (Xiao Chen via Yongjun Zhang)
(cherry picked from commit 2a4c7d4fac)
2015-12-11 20:56:46 -08:00
Xiaoyu Yao 08616b3654 HDFS-8785. TestDistributedFileSystem is failing in trunk. Contributed by Xiaoyu Yao.
(cherry picked from commit 2196e39e14)
2015-12-11 20:56:12 -08:00
Uma Mahesh 5b1e1dfb3f HDFS-9528. Cleanup namenode audit/log/exception messages. (szetszwo via umamahesh)
(cherry picked from commit 796a676d18)
2015-12-11 19:18:25 -08:00
Yongjun Zhang e00888d5cb HDFS-9532. Detailed exception info is lost in reportTo methods of ErrorReportAction and ReportBadBlockAction. (Yongjun Zhang)
(cherry picked from commit f5a911452f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-12-11 18:24:50 -08:00
Xiaoyu Yao 5595b912e4 HDFS-8326. Documentation about when checkpoints are run is out of date. (Misty Stanley-Jones via xyao)
(cherry picked from commit d0e75e60fb)
2015-12-11 08:41:30 -08:00
Kihwal Lee a72ef921f0 HDFS-9445. Datanode may deadlock while handling a bad volume. Contributed by Walter Su.
(cherry picked from commit a48301791e)
2015-12-11 08:46:03 -06:00
Uma Mahesh 7dc558b6a7 HDFS-9472. concat() API does not give proper exception messages on ./reserved relative path (Rakesh R via umamahesh)
(cherry picked from commit e363417e7b)
2015-12-11 00:01:02 -08:00
Lei Xu fb909554a8 Revert "HDFS-8860. Remove unused Replica copyOnWrite code (Lei (Eddy) Xu via Colin P. McCabe)"
This reverts commit b9bf1a9391.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/DataNodeTestUtils.java
2015-12-10 11:23:02 -10:00
Tsz-Wo Nicholas Sze c65a796f88 HDFS-9527. The return type of FSNamesystem.getBlockCollection should be changed to INodeFile. 2015-12-09 18:10:34 -08:00
Vinod Kumar Vavilapalli e81cb68508 HDFS-9273. Moving to 2.6.3 CHANGES section to reflect the backport. 2015-12-08 11:34:05 -08:00
Jing Zhao c993327483 HDFS-9129. Move the safemode block count into BlockManager. Contributed by Mingliang Liu. 2015-12-07 13:46:12 -08:00
Steve Loughran af14458de7 HADOOP-12321. Make JvmPauseMonitor an AbstractService. (Sunil G via Stevel) [includes HDFS-8947 MAPREDUCE-6462 and YARN-4072] 2015-12-06 17:42:56 +00:00
Arpit Agarwal 71be31201a HDFS-9414. Refactor reconfiguration of ClientDatanodeProtocol for reusability. (Contributed by Xiaobing Zhou) 2015-12-04 20:53:43 -08:00
Lei Xu ce49ba39d2 HDFS-9491. Tests should get the number of pending async deletes via FsDatasetTestUtils. (Tony Wu via lei)
(cherry picked from commit c92713dac56da0f836382005d84b577cfeb36a05)
2015-12-04 18:05:51 -08:00
Xiaoyu Yao eb7f9901b4 HDFS-8831. Trash Support for deletion in HDFS encryption zone. Contributed by Xiaoyu Yao.
(cherry picked from commit cbc7b6bf97)
2015-12-04 16:57:58 -08:00
Arpit Agarwal 9ddd7a95b9 HDFS-9214. Support reconfiguring dfs.datanode.balance.max.concurrent.moves without DN restart. (Contributed by Xiaobing Zhou) 2015-12-04 14:46:54 -08:00
Yongjun Zhang 78a21e773d HDFS-9474. TestPipelinesFailover should not fail when printing debug message. (John Zhuge via Yongjun Zhang)
(cherry picked from commit 59dbe8b3e9)
2015-12-04 13:50:03 -08:00
Colin P. McCabe 3beedc177d HDFS-9267. TestDiskError should get stored replicas through FsDatasetTestUtils. (Lei (Eddy) Xu via Colin P. McCabe)
(cherry picked from commit e02bbeb886)
2015-12-04 12:51:55 -08:00
Lei Xu 58714f3b73 HDFS-9490. MiniDFSCluster should change block generation stamp via FsDatasetTestUtils. (Tony Wu via lei)
(cherry picked from commit 0ac8fb4b33)
2015-12-04 10:26:06 -08:00
Ming Ma a68faf1a02 HDFS-9430 Remove waitForLoadingFSImage since checkNNStartup has ensured image loaded and namenode started. (Brahma Reddy Battula via mingma)
(cherry picked from commit 3fa33b5c2c)
2015-12-04 09:55:02 -08:00
Konstantin V Shvachko 33d4588a7c HDFS-9484. NNThroughputBenchmark$BlockReportStats should not send empty block reports. Contributed by Mingliang Liu. 2015-12-03 14:56:00 -08:00
Konstantin V Shvachko 3aa73a867a HDFS-9436. Make NNThroughputBenchmark$BlockReportStats run with 10 datanodes by default. Contributed by Mingliang. 2015-12-03 14:54:06 -08:00
Tsz-Wo Nicholas Sze bac127a4e2 HDFS-9294. DFSClient deadlock when close file and failed to renew lease. Contributed by Brahma Reddy Battula 2015-12-02 17:49:16 -08:00
Colin Patrick Mccabe 9b516a2a05 HDFS-9429. Tests in TestDFSAdminWithHA intermittently fail with EOFException (Xiao Chen via Colin P. McCabe)
(cherry picked from commit 53e3bf7e70)
2015-12-01 23:58:09 -08:00