Commit Graph

2766 Commits

Author SHA1 Message Date
Lei Xu b4b5468152 HDFS-9655. NN should start JVM pause monitor before loading fsimage. (John Zhuge via Lei (Eddy) Xu)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
2016-01-20 14:35:59 -08:00
Ravi Prakash a359dc87d4 HADOOP-12696. Add tests for S3FileSystem Contract. Contributed by Matt Paduano
(cherry picked from commit 1acc509b45)
(cherry picked from commit 2cbb8bbd72)
2016-01-19 14:01:51 -08:00
Wangda Tan 5dc2e78c97 HADOOP-12356. Fix computing CPU usage statistics on Windows. (Inigo Goiri via wangda)
(cherry picked from commit 89d1fd5dac)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2016-01-19 21:31:35 +08:00
Akira Ajisaka ca22066582 HDFS-9623. Update example configuration of block state change log in log4j.properties. Contributed by Masatake Iwasaki.
(cherry picked from commit 92c5f565fd)
(cherry picked from commit 3a8d372518)
2016-01-19 13:32:54 +09:00
cnauroth ffc0d98886 HADOOP-12635. Adding Append API support for WASB. Contributed by Dushyanth.
(cherry picked from commit 8bc93db2e7)
(cherry picked from commit 62d6166211)
2016-01-18 09:13:31 -08:00
cnauroth 23d729f841 HADOOP-12691. Add CSRF Filter for REST APIs to Hadoop Common. Contributed by Larry McCay.
(cherry picked from commit 06f4ac0ccd)
(cherry picked from commit 9600736d89)
2016-01-18 09:09:56 -08:00
Ravi Prakash 5468c40fe7 HADOOP-12689. S3 filesystem operations stopped working correctly
(cherry picked from commit 2d16f40dab)
(cherry picked from commit 6330683778)
2016-01-15 15:19:15 -08:00
Akira Ajisaka 8a23379283 HADOOP-12700. Remove unused import in TestCompressorDecompressor.java. Contributed by John Zhuge.
(cherry picked from commit f977366d9522ee31080e16db90972729fcfe256f)
(cherry picked from commit f0b1b53173)
2016-01-15 10:58:20 +09:00
Akira Ajisaka 91c1736b7a Correct the section of HADOOP-12590 in CHANGES.txt. 2016-01-15 10:53:16 +09:00
Steve Loughran 1fc36b824c HADOOP-12590. TestCompressorDecompressor failing without stack traces (John Zhuge via stevel)
(cherry picked from commit 80734bc346)
2016-01-15 10:41:56 +09:00
Jason Lowe 4ab508ead4 HADOOP-12706. TestLocalFsFCStatistics#testStatisticsThreadLocalDataCleanUp times out occasionally. Contributed by Sangjin Lee and Colin Patrick McCabe
(cherry picked from commit cdf8895259)
2016-01-14 23:48:12 +00:00
Jason Lowe fe77cb1df0 Update CHANGES.txt for commit of HADOOP-12107 to branch-2.7 and branch-2.6
(cherry picked from commit 651c23e8ef)
2016-01-14 23:43:09 +00:00
Benoy Antony 6cfeb84a36 HADOOP-12587. Hadoop AuthToken refuses to work without a maxinactive attribute in issued token. (Benoy Antony) 2016-01-14 14:42:04 -08:00
Yongjun Zhang a7d33b934a Revert "HADOOP-12700. Remove unused import in TestCompressorDecompressor.java. Contributed by John Zhuge."
This reverts commit b3fa190297.
2016-01-14 13:06:03 -08:00
Akira Ajisaka b3fa190297 HADOOP-12700. Remove unused import in TestCompressorDecompressor.java. Contributed by John Zhuge.
(cherry picked from commit f977366d9522ee31080e16db90972729fcfe256f)
(cherry picked from commit 722d9e569ee6891e71274e758474063f25f5babf)
2016-01-15 00:32:07 +09:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 7eb63d4e7c 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:35 -08:00
cnauroth c3f4cb927a HADOOP-12603. TestSymlinkLocalFSFileContext#testSetTimesSymlinkToDir occasionally fail. Contributed by Wei-Chiu Chuang.
(cherry picked from commit d64cec0fdaddbb892d66ecff358f547b939005f1)
(cherry picked from commit 2605e78e44)
2016-01-12 15:42:00 -08:00
Lei Xu 39f07295fb HADOOP-11262. Enable YARN to use S3A. (Pieter Reuse via lei)
(cherry picked from commit 126705f67e)
2016-01-12 12:21:00 -08:00
Akira Ajisaka 3fced13eae HADOOP-12584. Disable browsing the static directory in HttpServer2. Contributed by Robert Kanter.
(cherry picked from commit 9c89bcd04212543ae279d34938ec2ad319e5ba6d)
(cherry picked from commit 6f80be98758ff5d53a192f86ada6cc4062fcdef8)
2016-01-12 13:35:03 +09:00
cnauroth e26f702866 HADOOP-12551. Introduce FileNotFoundException for WASB FileSystem API. Contributed by Dushyanth.
(cherry picked from commit 0e76f1fcea)
(cherry picked from commit 813841e10b)
2016-01-09 22:18:30 -08:00
cnauroth f0f8e3ee7c HADOOP-12678. Handle empty rename pending metadata file during atomic rename in redo path. Contributed by Madhumita Chakraborty.
(cherry picked from commit f0fa6d869b)
(cherry picked from commit debd13387d)
2016-01-08 20:19:18 -08:00
Steve Loughran 092901345e HADOOP-12675. Fix description about retention period in usage of expunge command. (Masatake Iwasaki via stevel) 2016-01-07 14:39:36 +00:00
cnauroth 506a517f9f HADOOP-12634. Change Lazy Rename Pending Operation Completion of WASB to address case of potential data loss due to partial copy. Contributed by Gaurav Kanade.
(cherry picked from commit 978bbdfeb2)
(cherry picked from commit 4753676a34)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2016-01-06 11:17:01 -08:00
Yongjun Zhang f372d3faae HADOOP-12604. Exception may be swallowed in KMSClientProvider. (Yongjun Zhang)
(cherry picked from commit 28bd138018)
2016-01-05 11:19:39 -08:00
Uma Mahesh 68ee13e4f5 HADOOP-12658. Clear javadoc and check style issues around DomainSocket. Contributed by Kai Zheng
(cherry picked from commit 778146eaae)
2016-01-04 15:14:14 -08:00
Akira Ajisaka a319df412f HADOOP-12686. Update FileSystemShell documentation to mention the meaning of each columns of fs -du. Contributed by Daisuke Kobayashi.
(cherry picked from commit 1af2917856)
(cherry picked from commit 40b41ac8fc)
2016-01-04 20:33:57 +09:00
Akira Ajisaka 22ac1a1ac0 Set release date for 2.6.3
(cherry picked from commit db99e30f67)
(cherry picked from commit 247ab92464)
2016-01-04 16:13:06 +09:00
Akira Ajisaka 13a48f6256 HADOOP-11252. RPC client does not time out by default. Contributed by Wilfred Spiegelenburg and Masatake Iwasaki.
(cherry picked from commit 64ae85fd2e)
(cherry picked from commit d98cfe611f)
2016-01-04 14:32:21 +09:00
Xiaoyu Yao c16e126d16 HADOOP-12608. Fix exception message in WASB when connecting with anonymous credential. Contributed by Dushyanth.
(cherry picked from commit 007a8decc61750720033e06b6d08861ac3788e41)
2015-12-30 11:16:06 -08:00
Xiaoyu Yao a48fdc1907 HADOOP-12682. Fix TestKMS#testKMSRestart* failure. Contributed by Wei-Chiu Chuang.
(cherry picked from commit ab725cff66)
2015-12-30 10:44:13 -08:00
Xiaoyu Yao beec7a2efb HADOOP-12559. KMS connection failures should trigger TGT renewal. Contributed by Zhe Zhang.
(cherry picked from commit 993311e547)
2015-12-28 10:47:20 -08:00
Akira Ajisaka c60792e6e5 HADOOP-12681. start-build-env.sh fails in branch-2. Contributed by Kengo Seki.
(cherry picked from commit babe025fb0)
2015-12-28 14:39:51 +09:00
Akira Ajisaka 1cd85efd71 HDFS-9505. HDFS Architecture documentation needs to be refreshed. Contributed by Masatake Iwasaki.
(cherry picked from commit fa544020f6)
(cherry picked from commit 7526a2a005)
2015-12-21 21:23:40 +09:00
Chris Douglas 4150d08a4b HADOOP-12636. Prevent ServiceLoader failure init for unused FileSystems. Contributed by Inigo Goiri
(cherry picked from commit 8652cce5b2)
(cherry picked from commit d984ba4fd7)
2015-12-18 18:31:36 -08:00
cnauroth d6f1d3b6ca HADOOP-12570. HDFS Secure Mode Documentation updates. Contributed by Arpit Agarwal.
(cherry picked from commit 932956458d)
(cherry picked from commit dd91cf9fa5)
2015-12-18 16:54:36 -08:00
Xiaoyu Yao f3ee0e7857 HDFS-8831. Trash Support for deletion in HDFS encryption zone. Contributed by Xiaoyu Yao.
(cherry picked from commit cbc7b6bf97)
(cherry picked from commit eb7f9901b4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2015-12-18 16:34:43 -08:00
Jian He f355645ca4 YARN-4405. Support node label store in non-appendable file system. Contributed by Wangda Tan
(cherry picked from commit 755dda8dd8)

(cherry picked from commit be404e1680)
2015-12-18 16:34:42 -08:00
Arpit Agarwal cef21b7aaa HADOOP-12656. MiniKdc throws "address in use" BindException. (Contributed by Wei-Chiu Chuang) 2015-12-18 16:08:22 -08:00
Zhe Zhang 65effb76d9 HDFS-9347. Invariant assumption in TestQuorumJournalManager.shutdown() is wrong. Contributed by Wei-Chiu Chuang.
Change-Id: Idde8522e11c77f82b376e0c90a9bf33d163d5cb9
2015-12-18 16:06:42 -08:00
Akira Ajisaka e09d026105 HADOOP-12657. Add a option to skip newline on empty files with getMerge -nl. Contributed by Kanaka Kumar Avvaru.
(cherry picked from commit 061c05cc05)
(cherry picked from commit af49823499)
2015-12-18 14:00:42 +09:00
Akira Ajisaka c18bf20154 HADOOP-12588. Fix intermittent test failure of TestGangliaMetrics. Contributed by Masatake Iwasaki.
(cherry picked from commit bd5e207432)
(cherry picked from commit e06c291245)
2015-12-18 13:13:12 +09:00
Vinod Kumar Vavilapalli 753c9292c2 HADOOP-12415. Fixed pom files to correctly include compile-time dependency on netty. (Tom Zeng via cos)
Addendum commit to include CHANGES.txt entry.

(cherry picked from commit ce16541c62)
2015-12-16 14:42:09 -08:00
Uma Mahesh 58cc106378 HADOOP-12639. Improve JavaDoc for getTrimmedStrings. (BELUGA BEHR via umamahesh)
(cherry picked from commit ae67c8424c)
2015-12-15 15:21:58 -08:00
Akira Ajisaka 028f66b8a2 HADOOP-12602. TestMetricsSystemImpl#testQSize occasionally fails. Contributed by Masatake Iwasaki.
(cherry picked from commit eee0cf4611)
(cherry picked from commit 5047ee56af)
2015-12-11 16:19:12 +09:00
Uma Mahesh 9c5650cf03 HADOOP-12618. Fix NPE in TestSequenceFile. (Brahma Reddy Battula via umamahesh)
(cherry picked from commit ad53c52063)
2015-12-08 23:03:19 -08:00
mattf 05a7fb3a9a HADOOP-12617. SPNEGO authentication request to non-default realm gets default realm name inserted in target server principal. (mattf) 2015-12-08 17:46:36 -08:00
Haohui Mai 274af9b579 HADOOP-10729. Add tests for PB RPC in case version mismatch of client and server. Contributed by Junping Du. 2015-12-09 05:44:36 +08:00
Akira Ajisaka 78552d8857 HADOOP-12565. Replace DSA with RSA for SSH key type in SingleCluster.md. Contributed by Mingliang Liu.
(cherry picked from commit 3857fed2c8)
(cherry picked from commit 15c2f709c6)
2015-12-03 11:52:11 +08:00
Junping Du 12fb8b4cc5 Add 2.6.4 as release entry to CHANGES.txt 2015-12-02 07:38:03 -08:00
Arpit Agarwal a99274ea96 HADOOP-12609. Fix intermittent failure of TestDecayRpcScheduler. (Contributed by Masatake Iwasaki) 2015-12-01 15:29:39 -08:00
Yongjun Zhang 3b9043348a HADOOP-12468. Partial group resolution failure should not result in user lockout. (Wei-Chiu Chuang via Yongjun Zhang)
(cherry picked from commit 0348e769ab)
(cherry picked from commit 165abe6c4f)
2015-12-01 15:01:56 -08:00
Allen Wittenauer 81a7ad45c9 HADOOP-12366. expose calculated paths (aw) 2015-12-01 08:15:57 -08:00
cnauroth 6417121ddb HADOOP-12600. FileContext and AbstractFileSystem should be annotated as a Stable interface. Contributed by Chris Nauroth.
(cherry picked from commit b2c78536cb)
(cherry picked from commit 669743ce11)
2015-11-28 15:40:25 -08:00
Vinod Kumar Vavilapalli efaef45a24 Reverting previous commit which added 2.9.0 entries. Don't need that in branch-2.8.
Revert "Adding release 2.8.0 to CHANGES.txt"

This reverts commit 767815f317.
2015-11-25 17:49:48 -08:00
Vinod Kumar Vavilapalli 767815f317 Adding release 2.8.0 to CHANGES.txt
(cherry picked from commit d57fd181c7)
2015-11-25 17:37:47 -08:00
Robert Kanter 8c6273d117 MAPREDUCE-6549. multibyte delimiters with LineRecordReader cause duplicate records (wilfreds via rkanter)
(cherry picked from commit 7fd00b3db4)
2015-11-25 17:03:52 -08:00
Akira Ajisaka 4257991257 HADOOP-12598. Add XML namespace declarations for some hadoop/tools modules. Contributed by Xin Wang.
(cherry picked from commit b53f20135599cc7825b6213794e2f999bc43e2ad)
2015-11-26 01:21:32 +09:00
Allen Wittenauer 38f8952c4d HADOOP-11954. Solaris does not support RLIMIT_MEMLOCK as in Linux (Alan Burlison via aw) 2015-11-24 12:48:02 -08:00
Jason Lowe 7923130114 Revert "HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Brahma Reddy Battula."
This reverts commit 4356e8a5ef.

Conflicts:

	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
(cherry picked from commit 17b1a5482b)
2015-11-24 19:13:26 +00:00
Jian He b339a4b8d6 YARN-4349. Support CallerContext in YARN. Contributed by Wangda Tan
(cherry picked from commit 8676a118a1)
2015-11-23 17:20:24 -08:00
Haohui Mai 75b007260b Revert "HADOOP-12572. Update Hadoop's lz4 to r131. Contributed by Kevin Bowling."
This reverts commit 74d67b2250.
2015-11-23 14:59:55 -08:00
Haohui Mai 1cdf422ba8 HADOOP-9822. create constant MAX_CAPACITY in RetryCache rather than hard-coding 16 in RetryCache constructor. Contributed by Tsuyoshi Ozawa. 2015-11-23 13:23:14 -08:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) c824920527 HADOOP-12577. Bumped up commons-collections version to 3.2.2 to address a security flaw. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 70c26703f4)
2015-11-23 10:00:40 -08:00
Haohui Mai f826195ee5 HADOOP-12313. NPE in JvmPauseMonitor when calling stop() before start(). Contributed by Gabor Liptak. 2015-11-22 23:07:51 -08:00
Haohui Mai c07fab5f6f HDFS-9024. Deprecate the TotalFiles metric. Contributed by Akira Ahisaka. 2015-11-22 23:03:05 -08:00
Haohui Mai 16bcf66c1b HADOOP-11677. Add cookie flags for logs and static contexts. Contributed by nijel. 2015-11-22 19:53:19 -08:00
Haohui Mai 579f9030da HADOOP-11149. Increase the timeout of TestZKFailoverController. Contributed by Steve Loughran. 2015-11-22 19:46:13 -08:00
Haohui Mai afac7a2640 HADOOP-10068. Improve log4j regex in testFindContainingJar. Contributed by Robert Rati. 2015-11-22 18:29:10 -08:00
Haohui Mai 1d175f0f3f HADOOP-10465. Fix use of generics within SortedMapWritable. Contributed by Bertrand Dechoux. 2015-11-22 18:12:53 -08:00
Haohui Mai c7a9cbbdde HADOOP-10555. Add offset support to MurmurHash. Contributed by Sergey Shelukhin. 2015-11-22 18:00:41 -08:00
Haohui Mai 6ed8f24041 HADOOP-10035. Cleanup TestFilterFileSystem. Contributed by Suresh Srinivas. 2015-11-22 17:30:14 -08:00
Haohui Mai ac0694eb6e HADOOP-12098. Remove redundant test dependencies in Hadoop Archives. Contributed by Varun Saxena. 2015-11-22 17:25:29 -08:00
Haohui Mai def7490b29 HADOOP-12181. Fix intermittent test failure of TestZKSignerSecretProvider. Contributed by Masatake Iwasaki. 2015-11-22 16:56:22 -08:00
Haohui Mai 812dbea5c0 HADOOP-12467. Respect user-defined JAVA_LIBRARY_PATH in Windows Hadoop scripts. Contributed by Radhey Shah. 2015-11-22 16:04:06 -08:00
Haohui Mai 64add87f5c HADOOP-11218. Add TLSv1.1,TLSv1.2 to KMS, HttpFS, SSLFactory. Contributed by Vijay Singh. 2015-11-22 16:00:44 -08:00
Haohui Mai 74d67b2250 HADOOP-12572. Update Hadoop's lz4 to r131. Contributed by Kevin Bowling. 2015-11-22 15:43:34 -08:00
Steve Loughran edcd0dc0b2 Revert "HADOOP-12584. Disable browsing the static directory in HttpServer2. Contributed by Robert Kanter."
This reverts commit b7e3f419bd.
2015-11-22 11:41:44 +00:00
Haohui Mai b7e3f419bd HADOOP-12584. Disable browsing the static directory in HttpServer2. Contributed by Robert Kanter. 2015-11-19 15:47:41 -08:00
Haohui Mai 03c292efb7 HADOOP-11901. BytesWritable fails to support 2G chunks due to integer overflow. Contributed by Reynold Xin. 2015-11-19 12:54:16 -08:00
Tsuyoshi Ozawa aa792b7d0c HADOOP-12575. Add build instruction for docker toolbox instead of boot2docker. Contributed by Kai Sasaki.
(cherry picked from commit 25e82b4eb9)
2015-11-19 17:44:21 +09:00
Tsuyoshi Ozawa c5fb02ba25 HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get() and getSize(). Contributed by Akira AJISAKA.
(cherry picked from commit bd166f0eed)
2015-11-19 17:27:35 +09:00
Tsuyoshi Ozawa eb4c9765d9 HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io package. Contributed by Dustin Cote.
(cherry picked from commit 989b9e3e11)
2015-11-19 01:38:40 +09:00
Eric Yang 123e0b16f2 HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431740 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 8064849203)
2015-11-19 01:36:24 +09:00
Akira Ajisaka d5782a4199 HADOOP-12568. Update core-default.xml to describe posixGroups support. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 4a3b8f1ed2)
2015-11-18 17:23:34 +09:00
cnauroth 397836a7b3 HADOOP-12567. NPE in SaslRpcServer. Contributed by Sergey Shelukhin.
(cherry picked from commit 7fab5c8cec)
2015-11-17 16:00:33 -08:00
Akira Ajisaka 8de7911eb3 MAPREDUCE-6499. Add elapsed time for retired job in JobHistoryServer WebUI. Contributed by Lin Yiqun.
(cherry picked from commit a7f776ffdf)
2015-11-17 15:18:32 +09:00
Tsuyoshi Ozawa d66fe1155b Move HADOOP-11361, HADOOP-12348 and HADOOP-12482 from 2.8.0 to 2.7.3 in CHANGES.txt for backporting.
(cherry picked from commit c753617a48)
2015-11-14 14:44:17 +09:00
Akira Ajisaka 1b9385c56c Move HADOOP-12374 from 2.8.0 to 2.7.3 in CHANGES.txt.
(cherry picked from commit 47c79a2a4d)
2015-11-14 13:15:35 +09:00
Akira Ajisaka c5c663c05d HADOOP-12545. Hadoop javadoc has broken links for AccessControlList, ImpersonationProvider, DefaultImpersonationProvider, and DistCp. Contributed by Arshad Mohammad.
(cherry picked from commit f94d892704)
2015-11-13 21:53:23 +09:00
Haohui Mai 5d9212c139 HADOOP-12562. Make hadoop dockerfile usable by Yetus. Contributed by Allen Wittenauer. 2015-11-12 10:20:33 -08:00
Tsuyoshi Ozawa f6cecbfce5 Updated CHANGES.txt to move HADOOP-12526 to 2.6.3. 2015-11-11 23:21:36 +09:00
Vinod Kumar Vavilapalli b742ea7fe6 HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. Fixing bugs in
the first patch committed. (Karthik Kambatla via vinodkv)
2015-11-10 12:16:52 -08:00
Colin Patrick Mccabe 7a47989bc9 HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by HADOOP-12344 (Mingliang Liu via Colin P. McCabe)
(cherry picked from commit 493e8ae552)
2015-11-10 10:58:36 -08:00
Lei Xu a7243de1a1 HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
(cherry picked from commit 0eb9c60c5b)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
2015-11-09 23:02:38 -08:00
Haohui Mai c91bd3aabb HDFS-2261. AOP unit tests are not getting compiled or run. Contributed by Haohui Mai. 2015-11-09 15:26:01 -08:00
Sangjin Lee 7802248c23 HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) 2015-11-08 17:46:37 -08:00
Lei Xu 47941858af Revert "HADOOP-11684. S3a to use thread pool that blocks clients. (Thomas Demoor and Aaron Fabbri via lei)"
This reverts commit 01ae30796d.
2015-11-06 09:52:21 -08:00
Jason Lowe 836bfdd646 Update CHANGES.txt for commit of HADOOP 12413 to 2.7.3 and 2.6.3
(cherry picked from commit 74a9a51886)
2015-11-06 17:18:23 +00:00
Lei Xu 01ae30796d HADOOP-11684. S3a to use thread pool that blocks clients. (Thomas Demoor and Aaron Fabbri via lei)
(cherry picked from commit bff7c90a56)
2015-11-05 18:36:55 -08:00
Colin Patrick Mccabe f7e6a5dfb1 Revert "HADOOP-11887. Introduce Intel ISA-L erasure coding library for native erasure encoding support (Kai Zheng via Colin P. McCabe)"
This reverts commit bb3b2977cd.
2015-11-05 11:11:27 -08:00