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

4832 Commits

Author SHA1 Message Date
Takanobu Asanuma 4fa97013a9 HADOOP-14314. The OpenSolaris taxonomy link is dead in InterfaceClassification.md. Contributed by Rui Gao. 
(cherry picked from commit bed8cb6979)
 2018-08-23 21:55:40 +09:00
Steve Loughran 95fcdc0435
HADOOP-15679. ShutdownHookManager shutdown time needs to be configurable & extended. Contributed by Steve Loughran. 
Change-Id: Ifd4a6e3f796b4dc88e97f63066289e2534c77a29
 2018-08-20 18:48:49 -07:00
Xiao Chen 3712b79b38 HADOOP-9214. Create a new touch command to allow modifying atime and mtime. Contributed by Hrishikesh Gadre. 2018-08-20 14:59:14 -07:00
Xiao Chen a630a27c53 HADOOP-15655. Enhance KMS client retry behavior. Contributed by Kitti Nanasi. 2018-08-20 14:57:51 -07:00
Xiao Chen c0ac0a5337 HDFS-13658. Expose HighestPriorityLowRedundancy blocks statistics. Contributed by Kitti Nanasi. 2018-08-20 14:52:28 -07:00
Yiqun Lin e4b75ad583 HDFS-13792. Fix FSN read/write lock metrics name. Contributed by Chao Sun. 2018-08-20 14:50:47 -07:00
Xiao Chen 7556b09e9a HADOOP-15674. Test failure TestSSLHttpServer.testExcludedCiphers with TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 cipher suite. Contributed by Szilard Nemeth. 
(cherry picked from commit 8d7c93186e)
 2018-08-17 10:20:12 -07:00
Xiao Chen 1d748f0261 HADOOP-15638. KMS Accept Queue Size default changed from 500 to 128 in Hadoop 3.x. Contributed by Wei-Chiu Chuang. 
(cherry picked from commit b94c8874e2)
 2018-08-13 10:41:07 -07:00
Wangda Tan 781620a44d Make 3.1.1 awared by other branches 
(cherry picked from commit 49c687608b)
 2018-08-08 13:04:05 -07:00
Arpit Agarwal c8fbe7921b HADOOP-15476. fix logging for split-dns multihome . Contributed by Ajay Kumar. 2018-08-01 12:32:13 -07:00
Wangda Tan 5583711419 Preparing for 3.1.2 release 
Change-Id: If2793e2ed2b5b349a9e1f98f78df43f309dcfcbd
 2018-07-31 13:08:55 -07:00
Chen Liang 5194994757 HADOOP-15637. LocalFs#listLocatedStatus does not filter out hidden .crc files. Contributed by Erik Krogen. 2018-07-30 16:44:22 -07:00
Chen Liang 46fcbc5030 Revert "HADOOP-15637. LocalFs#listLocatedStatus does not filter out hidden .crc files. Contributed by Erik Krogen." 
This reverts commit 6812535b0b.
 2018-07-30 12:05:08 -07:00
Chen Liang 6812535b0b HADOOP-15637. LocalFs#listLocatedStatus does not filter out hidden .crc files. Contributed by Erik Krogen. 2018-07-30 10:33:02 -07:00
Eric Yang a869bd970e HADOOP-15593. Fixed NPE in UGI spawnAutoRenewalThreadForUserCreds. 
Contributed by Gabor Bota

(cherry picked from commit 77721f39e2)
 2018-07-26 18:47:58 -04:00
Gera Shegalov 1396fa2a27 HADOOP-15612. Improve exception when tfile fails to load LzoCodec. (gera) 
(cherry picked from commit 6bec03cfc8)
 2018-07-24 23:05:34 -07:00
Xiao Chen 40c06b389a HADOOP-15609. Retry KMS calls when SSLHandshakeException occurs. Contributed by Kitti Nanasi. 
(cherry picked from commit 81d59506e5)
 2018-07-24 21:46:21 -07:00
Daniel Templeton 00c476abd8 HDFS-13448. HDFS Block Placement - Ignore Locality for First Block Replica 
(Contributed by BELUGA BEHR via Daniel Templeton)

Change-Id: I965d1cfa642ad24296038b83e3d5c9983545267d
(cherry picked from commit 849c45db18)
 2018-07-24 16:12:43 -07:00
bibinchundatt 0710107f8d YARN-8544. [DS] AM registration fails when hadoop authorization is enabled. Contributed by Bibin A Chundatt. 
(cherry picked from commit 8461278833)
 2018-07-24 13:11:31 +05:30
Kihwal Lee a147098c4f HADOOP-15614. TestGroupsCaching.testExceptionOnBackgroundRefreshHandled reliably fails. Contributed by Weiwei Yang. 
(cherry picked from commit ccf2db7fc2)
 2018-07-19 11:19:19 -05:00
Wei-Chiu Chuang 34f1dd03ee HADOOP-15598. DataChecksum calculate checksum is contented on hashtable synchronization. Contributed by Prasanth Jayachandran. 
(cherry picked from commit 0c7a578927)
 2018-07-16 11:33:43 -07:00
Wei-Chiu Chuang f9fa3cb157 HDFS-13723. Occasional "Should be different group" error in TestRefreshUserMappings#testGroupMappingRefresh. Contributed by Siyao Meng. 
(cherry picked from commit 162228e8db)
 2018-07-11 10:04:07 -07:00
Xiaoyu Yao ffe2019887 HADOOP-15571. Multiple FileContexts created with the same configuration object should be allowed to have different umask. Contributed by Vinod Kumar Vavilapalli. 
(cherry picked from commit 629f7008b531bad469903e6a1f6f8cb4be691f36)
 2018-07-06 11:56:51 -07:00
Andrew Wang 9f2d57697a HADOOP-15554. Improve JIT performance for Configuration parsing. Contributed by Todd Lipcon. 
(cherry picked from commit f51da9c4d1)
 2018-07-02 18:31:27 +02:00
Nanda kumar e1cd5732a6 HADOOP-15574: Suppress build error if there are no docs after excluding private annotations. Contributed by Takanobu Asanuma. 
(cherry picked from commit d40121845e)
 2018-07-01 17:16:48 +05:30
Eric E Payne 012baf4313 HADOOP-15548: Randomize local dirs. Contributed by Jim Brennan. 
(cherry picked from commit d36f6b9e93)
 2018-06-29 18:22:51 +00:00
Eric Yang 3ce3571a34 YARN-8409. Fixed NPE in ActiveStandbyElectorBasedElectorService. 
Contributed by Chandni Singh
 2018-06-28 13:11:56 -04:00
Bharat Viswanadham 8fa530746f HDFS-13705:The native ISA-L library loading failure should be made warning rather than an error message. Contributed by Shashikant Banerjee. 
(cherry picked from commit d3fa83a44b)
 2018-06-28 09:26:58 -07:00
Inigo Goiri cbe15066c8 HADOOP-15458. TestLocalFileSystem#testFSOutputStreamBuilder fails on Windows. Contributed by Xiao Liang. 
(cherry picked from commit abc3e4bad9)
 2018-06-25 09:51:01 -07:00
Eric E Payne 1974dfa44d YARN-8444: NodeResourceMonitor crashes on bad swapFree value. Contributed by Jim Brennan. 
(cherry picked from commit 6432128622)
 2018-06-22 17:18:37 +00:00
Xiao Chen e8655b8c72 HDFS-13682. Cannot create encryption zone after KMS auth token expires. 
(cherry picked from commit 32f867a6a9)
 2018-06-20 15:59:23 -07:00
Eric Yang a31a966a20 HADOOP-15527. Improve delay check for stopping processes. 
Fixed script location.
               Contributed by Vinod Kumar Vavilapalli

(cherry picked from commit 2d87592fc6)
 2018-06-19 13:40:10 -04:00
Surendra Singh Lilhore 40652e77e0 HADOOP-15523. Shell command timeout given is in seconds whereas it is taken as millisec while scheduling. Contributed by Bilwa S T. 
(cherry picked from commit 3905fdb793)
 2018-06-17 12:14:20 +05:30
Yiqun Lin 5c1248b2da HDFS-13641. Add metrics for edit log tailing. Contributed by Chao Sun. 
(cherry picked from commit 8e7548d33b)
 2018-06-13 20:10:46 +08:00
Eric Yang f516a7a85f HADOOP-15527. Improve delay check for stopping processes. 
Contributed by Vinod Kumar Vavilapalli

(cherry picked from commit 108da85320)
 2018-06-12 21:12:21 -04:00
Inigo Goiri 6f31faf92b HADOOP-15532. TestBasicDiskValidator fails with NoSuchFileException. Contributed by Giovanni Matteo Fumarola. 
(cherry picked from commit aeaf9fec62)
 2018-06-12 14:17:25 -07:00
Rohith Sharma K S af0309d793 YARN-8405. RM zk-state-store.parent-path ACLs has been changed since HADOOP-14773. Contributed by Íñigo Goiri. 
(cherry picked from commit 2df73dace0)
 2018-06-12 17:23:22 +05:30
Yongjun Zhang 425fe4e217 Update CHANGES, RELEASENOTES, and jdiff for 3.0.3 release. 
(cherry picked from commit 5a82f10e32)
 2018-06-11 14:31:46 -07:00
Sammi Chen e3c96354a7 HADOOP-15499. Performance severe drops when running RawErasureCoderBenchmark with NativeRSRawErasureCoder. Contributed by Sammi Chen. 
(cherry picked from commit 18201b882a)
(cherry picked from commit b874110275)
 2018-06-11 14:03:39 +08:00
Inigo Goiri 8526ba9a69 HADOOP-15516. Add test cases to cover FileUtil#readLink. Contributed by Giovanni Matteo Fumarola. 
(cherry picked from commit 12be8bad7d)
 2018-06-07 13:35:32 -07:00
Xiao Chen f1c91e9fda HADOOP-15217. FsUrlConnection does not handle paths with spaces. Contributed by Joseph Fourny and Zsolt Venczel. 
(cherry picked from commit ba4011d64f)
 2018-06-05 21:19:11 -07:00
Daniel Templeton 09fd1348e8 HDFS-13636. Cross-Site Scripting vulnerability in HttpServer2 
(Contributed by Haibo Yan via Daniel Templeton)

Change-Id: I28edde8125dd20d8d270f0e609d1c04d8173c8b7
(cherry picked from commit cba3194998)
 2018-06-01 14:44:22 -07:00
Kihwal Lee 11a425d11a Additional check when unpacking archives. Contributed by Wilfred Spiegelenburg. 
(cherry picked from commit e3236a9680)
 2018-05-29 15:02:33 -05:00
Inigo Goiri 1dd9670ddd HADOOP-15497. TestTrash should use proper test path to avoid failing on Windows. Contributed by Anbang Hu. 
(cherry picked from commit 3c75f8e493)
 2018-05-29 09:11:38 -07:00
Karthik Palanisamy b0ce76d71f
HADOOP-15449. Increase default timeout of ZK session to avoid frequent NameNode failover 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit 61df174e8b)
 2018-05-28 19:41:58 +09:00
Xiao Chen 1c0ee35662 HADOOP-15473. Configure serialFilter in KeyProvider to avoid UnrecoverableKeyException caused by JDK-8189997. Contributed by Gabor Bota. 
(cherry picked from commit 02322de3f9)
 2018-05-25 09:41:04 -07:00
Miklos Szegedi 1483c90379 YARN-8310. Handle old NMTokenIdentifier, AMRMTokenIdentifier, and ContainerTokenIdentifier formats. Contributed by Robert Kanter. 
(cherry picked from commit 3e5f7ea986)
 2018-05-24 15:14:15 -07:00
Arpit Agarwal 76f38f3f8b HADOOP-15486. Make NetworkTopology#netLock fair. Contributed by Nanda kumar. 2018-05-23 10:30:37 -07:00
Sammi Chen 7d71b3a1cc HDFS-13540. DFSStripedInputStream should only allocate new buffers when reading. Contributed by Xiao Chen. 
(cherry picked from commit 34e8b9f9a8)
 2018-05-23 19:12:04 +08:00
Akira Ajisaka fc4c20fc34
Additional check when unpacking archives. Contributed by Jason Lowe and Akira Ajisaka. 
(cherry picked from commit 745f203e57)
 2018-05-23 17:18:19 +09:00
Kihwal Lee 6b8a5af6ef HADOOP-15450. Avoid fsync storm triggered by DiskChecker and handle disk full situation. Contributed by Arpit Agarwal. 
(cherry picked from commit bcc8e76bad)
 2018-05-22 11:22:22 -05:00
Rushabh Shah 1c594639f1 Skip the proxy user check if the ugi has not been initialized. Contributed by Daryn Sharp 
(cherry picked from commit 73e9120ad7)
 2018-05-21 12:39:59 -05:00
Inigo Goiri 472495ed1e HDFS-13586. Fsync fails on directories on Windows. Contributed by Lukas Majercack. 
(cherry picked from commit 8783613696)
 2018-05-17 19:27:23 -07:00
Inigo Goiri df54cdbaea HDFS-13560. Insufficient system resources exist to complete the requested service for some tests on Windows. Contributed by Anbang Hu. 
(cherry picked from commit 53b807a6a8)
 2018-05-17 17:03:56 -07:00
Steve Loughran f729faaabb HADOOP-15250. Split-DNS MultiHomed Server Network Cluster Network IPC Client Bind Addr Wrong 
Contributed by Ajay Kumar

(cherry picked from commit 8f42dafcf8)
 2018-05-17 10:14:27 -07:00
Sammi Chen e5281d9f8b Add 2.9.1 release notes and changes documents 2018-05-14 15:26:00 +08:00
Rushabh Shah 4d9a58756c HADOOP-15441. Log kms url and token service at debug level. Contributed by Gabor Bota 
(cherry picked from commit a5449d3631)
 2018-05-12 12:21:01 -05:00
Inigo Goiri f4f2912820 HADOOP-15454. TestRollingFileSystemSinkWithLocal fails on Windows. Contributed by Xiao Liang. 
(cherry picked from commit 1da8d4190d)
 2018-05-10 09:41:42 -07:00
Xiao Chen 752092a860 Revert "HADOOP-14445. Delegation tokens are not shared between KMS instances. Contributed by Xiao Chen and Rushabh S Shah." 
This reverts commit 583fa6ed48.

 Conflicts:
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/key/kms/KMSTokenRenewer.java
	hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java

(cherry picked from commit a3a1552c33)

 Conflicts:
	hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
 2018-05-07 13:47:52 -07:00
Rushabh Shah 864640c1e3 HADOOP-14841 Kms client should disconnect if unable to get output stream from connection. Contributed by Rushabh S Shah 
(cherry picked from commit 4cdbdce752)
 2018-05-04 15:49:39 -05:00
Daniel Templeton 57e4115436 HDFS-13481. TestRollingFileSystemSinkWithHdfs#testFlushThread: test failed intermittently 
(Contributed by Gabor Bota via Daniel Templeton)

Change-Id: I9921981dfa69669fe7912dd2a31ae8b638283204
(cherry picked from commit 87c23ef643)
 2018-05-02 17:17:46 -07:00
Jason Lowe cacd267b0d
HADOOP-15406. hadoop-nfs dependencies for mockito and junit are not test scope 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit e07156e8b0)
 2018-05-02 17:32:08 +09:00
Wangda Tan da9d5a3fee HADOOP-15411. AuthenticationFilter should use Configuration.getPropsWithPrefix instead of iterator. (Suma Shivaprasad via wangda) 
Change-Id: Ia19458a43aceb4ffdb1e8eccc519655235d92ba9
(cherry picked from commit 3559d8b1dacf5cf207424de37cb6ba8865d26ffe)
 2018-04-25 22:16:07 -07:00
Robert Kanter ea7ad50499 HADOOP-15390. Yarn RM logs flooded by DelegationTokenRenewer trying to renew KMS tokens (xiaochen via rkanter) 
(cherry picked from commit 7ab08a9c37)
 2018-04-23 16:25:41 -07:00
Mukul Kumar Singh 94076c4028 HADOOP-15366. Add a helper shutdown routine in HadoopExecutor to ensure clean shutdown. Contributed by Shashikant Banerjee. 2018-04-18 16:30:59 +05:30
Virajith Jalaparti 70830d9f9c HDFS-13311. RBF: TestRouterAdminCLI#testCreateInvalidEntry fails on Windows. Contributed by Inigo Goiri 2018-04-16 16:06:25 -07:00
Xiao Chen 805e33b62c HDFS-13056. Expose file-level composite CRCs in HDFS which are comparable across different instances/layouts. Contributed by Dennis Huo. 2018-04-16 11:58:10 -07:00
Yufei Gu 6891da1e75 HADOOP-15331. Fix a race condition causing parsing error of java.io.BufferedInputStream in class org.apache.hadoop.conf.Configuration. Contributed by Miklos Szegedi. 2018-04-13 10:13:34 -07:00
fang zhenyi 922a0db13c HADOOP-15330. Remove jdk1.7 profile from hadoop-annotations module 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
 2018-04-13 10:12:27 -07:00
Yufei Gu 9014f98b60 HADOOP-15062. TestCryptoStreamsWithOpensslAesCtrCryptoCodec fails on Debian 9. Contributed by Miklos Szegedi. 2018-04-13 10:12:01 -07:00
Chris Douglas ffc39ec3ab HADOOP-14667. Flexible Visual Studio support. Contributed by Allen Wittenauer 2018-04-13 10:11:35 -07:00
Bharat Viswanadham b652e915fb HADOOP-15379. Make IrqHandler.bind() public. Contributed by Ajay Kumar 
(cherry picked from commit ec1e8c1a8c)
 2018-04-12 21:55:40 -07:00
Xiao Chen 6d6f65f224 HADOOP-14445. Delegation tokens are not shared between KMS instances. Contributed by Xiao Chen and Rushabh S Shah. 
(cherry picked from commit 583fa6ed48)
 2018-04-10 15:45:35 -07:00
Xiao Chen 96af1af28f HADOOP-15313. TestKMS should close providers. 
(cherry picked from commit c22d62b338)
 2018-04-10 15:45:34 -07:00
Jason Lowe ffceb907fe HADOOP-15357. Configuration.getPropsWithPrefix no longer does variable substitution. Contributed by Jim Brennan 
(cherry picked from commit e81397545a)
 2018-04-10 16:49:27 -05:00
Ewan Higgs c9da1e97f8
HADOOP-15376. Remove double semi colons on imports that make Clover fall over. 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
(cherry picked from commit cef8eb7981)
 2018-04-10 23:59:34 +09:00
Wangda Tan 25bf1d3ac6 Updated branch-3.1 to track 3.1.1 
Change-Id: Idd55c79921b8acacc8a8a3258450e476f3abb706
 2018-04-09 10:58:50 -07:00
Wangda Tan a336561e2b Added CHANGES/RELEASES/Jdiff for 3.1.0 release 
Change-Id: Ied5067a996151c04d15cad46c46ac98b60c37b39
(cherry picked from commit 2d96570452a72569befdf9cfe9b90c9fa2e0e261)
 2018-04-05 15:52:02 -07:00
Wei Yan 89efe30f65 HDFS-13353. RBF: TestRouterWebHDFSContractCreate failed. Contributed by Takanobu Asanuma. 
(cherry picked from commit 3121e8c293)
 2018-04-05 13:13:16 -07:00
Xiao Chen 8d755371f2 HADOOP-15355. TestCommonConfigurationFields is broken by HADOOP-15312. Contributed by LiXin Ge. 
(cherry picked from commit f614b44fe583033947cc78d8f04cfe6fb64fc892)
 2018-04-02 23:10:17 -07:00
Xiao Chen dcb2176c5d HADOOP-15317. Improve NetworkTopology chooseRandom's loop. 
(cherry picked from commit 57374c4737)
 2018-04-02 22:48:54 -07:00
Konstantin V Shvachko 4ce45a8ec7 HADOOP-15253. Should update maxQueueSize when refresh call queue. Contributed by Tao Jie. 
(cherry picked from commit acfd764fcc)
 2018-03-30 18:57:18 -07:00
Konstantin V Shvachko 99b5b9dce1 HADOOP-12862. LDAP Group Mapping over SSL can not specify trust store. Contributed by Wei-Chiu Chuang and Konstantin Shvachko. 
(cherry picked from commit 2216bde322)
 2018-03-29 17:20:28 -07:00
Wei-Chiu Chuang 1176a128d6 HADOOP-15312. Undocumented KeyProvider configuration keys. Contributed by LiXin Ge. 
(cherry picked from commit 3fe41c65d8)
 2018-03-27 13:36:00 -07:00
Jitendra Pandey 91b98ad03a HADOOP-14067. VersionInfo should load version-info.properties from its own classloader. Contributed by Thejas M Nair. 2018-03-27 10:24:04 -07:00
Lei Xu 98d7a5aaef Update releasenotes and changelogs for 3.0.1 release 2018-03-23 11:53:16 -07:00
Inigo Goiri 9b96e7522b HDFS-13268. TestWebHdfsFileContextMainOperations fails on Windows. Contributed by Xiao Liang. 
(cherry picked from commit fe224ff972)
 2018-03-20 11:20:37 -07:00
Inigo Goiri 7eb0bdbd32 HDFS-13296. GenericTestUtils generates paths with drive letter in Windows and fail webhdfs related test cases. Contributed by Xiao Liang. 
(cherry picked from commit e65ff1c8be)
 2018-03-19 17:20:36 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 0bd99621c5 Preparing for 3.1.0 development 2018-03-19 15:16:54 -07:00
Xiao Chen 21c6661461 HADOOP-15234. Throw meaningful message on null when initializing KMSWebApp. Contributed by fang zhenyi. 2018-03-15 20:17:16 -07:00
Steve Loughran 1976e0066e HADOOP-15209. DistCp to eliminate needless deletion of files under already-deleted directories. 
Contributed by Steve Loughran.
 2018-03-15 18:05:14 +00:00
Aaron Fabbri e840b4adf4
HADOOP-15278 log s3a at info. Contributed by Steve Loughran. 2018-03-14 15:47:56 -07:00
Wangda Tan 252c2b4d52 Revert "HADOOP-13707. If kerberos is enabled while HTTP SPNEGO is not configured, some links cannot be accessed. Contributed by Yuanbo Liu" 
Change-Id: I946a466a43d56c73bb0135384e73cb8513595461
(cherry picked from commit 80ee5248b2dda1cb8d122d4f362f2f8cf02b9467)
 2018-03-14 13:36:53 -07:00
Takanobu Asanuma fea16a440d
HADOOP-15294. TestUGILoginFromKeytab fails on Java9 
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
 2018-03-14 13:38:07 +09:00
Inigo Goiri 427fd027a3 HADOOP-15308. TestConfiguration fails on Windows because of paths. Contributed by Xiao Liang. 2018-03-13 20:01:07 -07:00
Chris Douglas 9d6994da19 HADOOP-15311. HttpServer2 needs a way to configure the acceptor/selector count. Contributed by Erik Krogen 2018-03-13 13:55:18 -07:00
Chris Douglas 45d1b0fdcc HADOOP-14696. parallel tests don't work for Windows. Contributed by Allen Wittenauer 2018-03-12 20:05:39 -07:00
Steve Loughran dd05871b8b HADOOP-15297. Make S3A etag => checksum feature optional. 
Contributed by Steve Loughran.
 2018-03-12 14:01:42 +00:00
Owen O'Malley fa6a8b78d4 Revert "HADOOP-13119. Add ability to secure log servlet using proxy users. Contribute by Yuanbo Liu." 
This reverts commit a847903b6e.

Change-Id: I3122a2142f5bdf8507dece930e447556a43cd9ae
(cherry picked from commit 8fad3ec76070ccfcd3ed80feaba4355077bc6f5c)
 2018-03-09 22:46:41 -08:00
Owen O'Malley 3a8dade9b1 Revert "HADOOP-14077. Add ability to access jmx via proxy. Contributed by Yuanbo Liu." 
This reverts commit 172b23af33.

(cherry picked from commit d0d2d4c51e9534e08893ae14cf3fff7b2ee70b1d)
 2018-03-09 22:46:30 -08:00