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

2600 Commits

Author SHA1 Message Date
Harsh J 21b4ba48ce HADOOP-12458. Retries is typoed to spell Retires in parts of hadoop-yarn and hadoop-common. Contributed by Neelesh Srinivas Salian. 
(cherry picked from commit c918f7be5e)
 2015-10-03 18:39:22 +05:30
Jason Lowe 3e3733437f YARN-3619. ContainerMetrics unregisters during getMetrics and leads to ConcurrentModificationException. Contributed by Zhihai Xu 
(cherry picked from commit fdf02d1f26)
 2015-10-02 20:21:32 +00:00
Akira Ajisaka 966f9508c3 HADOOP-12230. hadoop-project declares duplicate, conflicting curator dependencies. Contributed by Rakesh R. 2015-10-02 12:40:05 +02:00
Zhihai Xu 07f9405692 HADOOP-8437. getLocalPathForWrite should throw IOException for invalid paths. Contributed by Brahma Reddy Battula 
(cherry picked from commit fd026f535c)
 2015-10-01 12:04:27 -07:00
Karthik Kambatla db145e0c9a HADOOP-12451. Setting HADOOP_HOME explicitly should be allowed. (kasha) 2015-10-01 11:29:50 -07:00
Akira Ajisaka c6f30e5913 HADOOP-10296. Incorrect null check in SwiftRestClient#buildException(). Contributed by Rahul Palamuttam and Kanaka Kumar Avvaru. 
(cherry picked from commit ecbfd68974)
 2015-10-01 18:35:19 +02:00
yliu 3625222635 HADOOP-12448. TestTextCommand: use mkdirs rather than mkdir to create test directory. (Contributed by Colin Patrick McCabe and Chris Nauroth) 2015-09-30 11:04:09 +08:00
Haohui Mai baa6ef0207 HDFS-9174. Fix findbugs warnings in FSOutputSummer.tracer and DirectoryScanner$ReportCompiler.currentThread. Contributed by Yi Liu. 2015-09-29 14:56:13 -07:00
Colin Patrick Mccabe 171bd1cb2b HADOOP-12447. Clean up some htrace integration issues (cmccabe) 
(cherry picked from commit 850d679acb)
 2015-09-29 09:38:10 -07:00
yliu 9c47ab32b1 HDFS-8859. Improve DataNode ReplicaMap memory footprint to save about 45%. (yliu) 2015-09-29 16:23:50 +08:00
Ming Ma ac7d85efb2 HADOOP-12440. TestRPC#testRPCServerShutdown did not produce the desired thread states before shutting down. (Xiao Chen via mingma) 
(cherry picked from commit 5c3b663bf9)
 2015-09-28 18:14:29 -07:00
Kihwal Lee 95b8f1f3a6 HADOOP-12446. Undeprecate createNonRecursive(). Contributed by Ted Yu. 
(cherry picked from commit 3abbdc929b)
 2015-09-28 17:33:20 -05:00
Colin Patrick Mccabe 3b9d32627f HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 
(cherry picked from commit 892ade689f)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
        hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/BlockStorageLocationUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 2015-09-28 08:15:00 -07:00
Vinayakumar B 1c7b3b98c1 HADOOP-11984. Enable parallel JUnit tests in pre-commit (Contributed by Chris Nauroth) 
(cherry picked from commit f0f984e4e6)
 2015-09-27 14:12:34 +05:30
Vinayakumar B b46e4ceafd HADOOP-12442. Display help if the command option to 'hdfs dfs' is not valid (Contributed by nijel) 
(cherry picked from commit 861b52db24)
 2015-09-26 21:37:24 +05:30
cnauroth 85c0cb0075 HADOOP-11918. Listing an empty s3a root directory throws FileNotFound. Contributed by Lei (Eddy) Xu. 
(cherry picked from commit 7fe521b1dd)
 2015-09-25 22:34:10 -07:00
Yongjun Zhang 16ae3f5d46 HDFS-9123. Copying from the root to a subdirectory should be forbidden. (Wei-Chiu Chuang via Yongjun Zhang) 
(cherry picked from commit 3187dbd7a8)
 2015-09-24 21:41:48 -07:00
Zhihai Xu 4ba0febd58 HADOOP-12252. LocalDirAllocator should not throw NPE with empty string configuration. Contributed by Zhihai Xu 
(cherry picked from commit 52c1f272ec)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-09-24 12:40:39 -07:00
Harsh J 9bb6fba759 HADOOP-8436. NPE In getLocalPathForWrite ( path, conf ) when the required context item is not configured. Contributed by Brahma Reddy Battula. (harsh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389799 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a7e450c7cc)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-09-24 12:30:55 -07:00
Arpit Agarwal 3c06162259 HADOOP-12437. Allow SecurityUtil to lookup alternate hostnames. (Contributed by Arpit Agarwal) 2015-09-24 11:41:58 -07:00
Haohui Mai 75c70339ab HADOOP-12438. Reset RawLocalFileSystem.useDeprecatedFileStatus in TestLocalFileSystem. Contributed by Chris Nauroth. 2015-09-23 19:34:19 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) f48af332a7 Release process for 2.6.1: Set the release date for 2.6.1 
(cherry picked from commit 1f707ecffd)
 2015-09-23 15:12:30 -07:00
Vinayakumar B 017dff9877 HDFS-9013. Deprecate NameNodeMXBean#getNNStarted in branch2 and remove from trunk (Contributed by Surendra Singh Lilhore) 
(cherry picked from commit a2c76e5f26)
 2015-09-23 15:45:21 +05:30
Tsuyoshi Ozawa 52cc2ca488 HADOOP-12428. Fix inconsistency between log-level guards and statements. Contributed by Jagadesh Kiran N and Jackie Chang. 
(cherry picked from commit dfd807afab)
 2015-09-22 12:54:44 +09:00
Steve Loughran a38dceda66 HADOOP-12360. Create StatsD metrics2 sink. (Dave Marion via stevel) 2015-09-19 12:41:29 +01:00
Zhihai Xu 6c66dd4875 HADOOP-12404. Disable caching for JarURLConnection to avoid sharing JarFile with other users when loading resource from URL in Configuration class. Contributed by Zhihai Xu 
(cherry picked from commit 88d89267ff)
 2015-09-18 10:44:53 -07:00
Zhihai Xu 7c429fbaa9 Revert "Disable caching for JarURLConnection to avoid sharing JarFile with other users when loading resource from URL in Configuration class. Contributed by Zhihai Xu" 
This reverts commit 7576b4247b.
 2015-09-18 10:25:38 -07:00
Zhihai Xu 7576b4247b Disable caching for JarURLConnection to avoid sharing JarFile with other users when loading resource from URL in Configuration class. Contributed by Zhihai Xu 
(cherry picked from commit e690a32e57)
 2015-09-18 08:27:58 -07:00
Wangda Tan 1f75e951f5 HADOOP-12386. RetryPolicies.RETRY_FOREVER should be able to specify a retry interval. (Sunil G via wangda) 
(cherry picked from commit 6b97fa6652)
 2015-09-17 17:47:22 -07:00
Jason Lowe 316296e35f MAPREDUCE-6481. LineRecordReader may give incomplete record and wrong position/key information for uncompressed input sometimes. Contributed by Zhihai Xu 
(cherry picked from commit 58d1a02b8d)
 2015-09-17 14:31:57 +00:00
Haohui Mai d5936aa48c HADOOP-12417. TestWebDelegationToken failing with port in use. Contributed by Mingliang Liu. 2015-09-16 18:38:54 -07:00
Eric Yang b4bb8e1731 HADOOP-12374. Updated expunge command description. 
(WeiWei Yang via eyang)
 2015-09-15 20:05:01 -07:00
Akira Ajisaka e38e5b56bd HADOOP-12416. Trash messages should be handled by Logger instead of being delivered on System.out. Contributed by Mingliang Liu. 
(cherry picked from commit 77aaf4cf7d)
 2015-09-16 10:20:53 +09:00
Vinayakumar B 2b78714c68 HDFS-8953. DataNode Metrics logging (Contributed by Kanaka Kumar Avvaru) 
(cherry picked from commit ce69c9b54c)
 2015-09-16 00:18:59 +05:30
cnauroth be9354d010 HADOOP-12413. AccessControlList should avoid calling getGroupNames in isUserInList with empty groups. Contributed by Zhihai Xu. 
(cherry picked from commit b2017d9b03)
 2015-09-15 10:42:02 -07:00
Vinayakumar B aa963ab441 HDFS-9067. o.a.h.hdfs.server.datanode.fsdataset.impl.TestLazyWriter is failing in trunk (Contributed by Surendra Singh Lilhore) 
(cherry picked from commit a440567491)
 2015-09-15 17:33:15 +05:30
Steve Loughran 988749e6ea HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal tags. (Akira AJISAKA via stevel). 2015-09-13 14:25:06 +01:00
Steve Loughran c8fe31e03a HADOOP-12407. Test failing: hadoop.ipc.TestSaslRPC. (stevel) 2015-09-12 18:55:42 +01:00
Steve Loughran c4128165b5 syncing branch-2 and trunk CHANGES.TXT to be closer together 2015-09-12 18:52:04 +01:00
Robert Kanter 764f8baa99 HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong time unit parameter. (zxu via rkanter) 2015-09-11 15:21:22 -07:00
Steve Loughran 4073539118 HADOOP-12324. Better exception reporting in SaslPlainServer. (Mike Yoder via stevel) 2015-09-11 15:55:14 +01:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) 2b447a38ab Updating all CHANGES.txt files to move entires from future releases into 2.6.1 
section given the large number of backports to 2.6.1. Contd..
 2015-09-10 14:07:55 -07:00
Vinod Kumar Vavilapalli (I am also known as @tshooter.) cbf90f93f9 Updating all CHANGES.txt files to move entires from future releases into 2.6.1 
section given the large number of backports to 2.6.1.

(cherry picked from commit fbbb7ff1ed)
 2015-09-10 14:01:15 -07:00
Vinayakumar B ddecd86818 HDFS-8929. Add a metric to expose the timestamp of the last journal (Contributed by surendra singh lilhore) 
(cherry picked from commit 94cf7ab9d2)
 2015-09-09 11:06:06 +05:30
Zhihai Xu 113f778303 HADOOP-12388. Fix components' version information in the web page About the Cluster. Contributed by Jun Gong. 
(cherry picked from commit d9c1fab2ec)
 2015-09-08 13:09:23 -07:00
Vinayakumar B a0594961de HADOOP-12384. Add '-direct' flag option for fs copy so that user can choose not to create '._COPYING_' file (Contributed by J.Andreina) 
(cherry picked from commit 090d26652c)
 2015-09-08 19:11:46 +05:30
Andrew Wang 355398e441 HADOOP-12358. Add -safely flag to rm to prompt when deleting many files. Contributed by Xiaoyu Yao. 
(cherry picked from commit e1feaf6db0)
 2015-09-04 13:48:42 -07:00
Arpit Agarwal e1842ce678 HDFS-9009. Send metrics logs to NullAppender by default. (Arpit Agarwal) 2015-09-03 11:14:53 -07:00
Tsuyoshi Ozawa 538a4ddc7e HADOOP-12213. Interrupted exception can occur when Client#stop is called. Contributed by Kuhu Shukla. 
(cherry picked from commit 0ebc658105)
 2015-09-03 23:32:59 +09:00
Tsuyoshi Ozawa 7f1abf0b27 HADOOP-10318. Incorrect reference to nodeFile in RumenToSLSConverter error message. Contributed by Wei Yan. 
(cherry picked from commit 355eaaa33d)
 2015-09-03 22:49:12 +09:00
Jian He cd82fa2f83 YARN-4101. RM should print alert messages if Zookeeper and Resourcemanager gets connection issue. Contributed by Xuan Gong 
(cherry picked from commit 09c64ba1ba)
 2015-09-02 17:46:04 -07:00
Akira Ajisaka 25efccba01 HDFS-8388. Time and Date format need to be in sync in NameNode UI page. Contributed by Surendra Singh Lilhore. 
(cherry picked from commit 65ccf2b125)
 2015-09-02 14:30:23 +09:00
Andrew Wang 7d833a3058 HADOOP-12369. Point hadoop-project/pom.xml java.security.krb5.conf within target folder. 
(cherry picked from commit 0eb9b19325)
 2015-09-01 10:59:39 -07:00
Tsuyoshi Ozawa b1499ab0fe HADOOP-10365. BufferedOutputStream in FileUtil#unpackEntries() should be closed in finally block. Contributed by Kiran Kumar M R and Sanghyun Yun. 
(cherry picked from commit dd149adeac)
 2015-09-02 02:02:10 +09:00
Akira Ajisaka 236c4ab511 HADOOP-12359. hadoop fs -getmerge doc is wrong. Contributed by Jagadesh Kiran N. 
(cherry picked from commit 2e251a7674)
 2015-09-01 20:56:46 +09:00
yliu 2345627ad3 HADOOP-12367. Move TestFileUtil's test resources to resources folder. (wang via yliu) 2015-09-01 16:25:11 +08:00
Andrew Wang 8dbe2a12bb HADOOP-12368. Mark ViewFileSystemBaseTest and ViewFsBaseTest as abstract. 
(cherry picked from commit 7ad3556ed3)
 2015-08-31 18:19:12 -07:00
Lei Xu de42fce390 HADOOP-12346. Increase some default timeouts / retries for S3a connector. (Sean Mackrory via Lei (Eddy) Xu) 2015-08-29 09:58:57 -07:00
Arpit Agarwal f1d5f1417e HDFS-8983. NameNode support for protected directories. (Contributed by Arpit Agarwal) 2015-08-29 09:57:53 -07:00
Andrew Wang 7a668981f5 HADOOP-12362. Set hadoop.tmp.dir and hadoop.log.dir in pom. Contributed by Charlie Helin. 
(cherry picked from commit 90fe7bcc3b)
 2015-08-27 10:17:04 -07:00
Jing Zhao 10c4d6df61 HDFS-8896. DataNode object isn't GCed when shutdown, because it has GC root in ShutdownHookManager. Contributed by Walter Su. 
(cherry picked from commit f44b599003)
 2015-08-26 16:28:38 -07:00
Harsh J e993498302 HADOOP-12352. Delay in checkpointing Trash can leave trash for 2 intervals before deleting. Contributed by Casey Brotherton. 
(cherry picked from commit af78767870)
 2015-08-25 11:22:08 +05:30
Xiaoyu Yao 7a0a31586a HADOOP-12325. RPC Metrics : Add the ability track and log slow RPCs. Contributed by Anu Engineer 
(cherry picked from commit 48774d0a45)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-08-24 14:33:37 -07:00
Xuan 205b98c059 YARN-221. NM should provide a way for AM to tell it not to aggregate 
logs. Contributed by Ming Ma

(cherry picked from commit 37e1c3d82a)
 2015-08-22 16:26:39 -07:00
Xiaoyu Yao a7e5a88b59 HADOOP-12347. Fix mismatch parameter name in javadocs of AuthToken#setMaxInactives. Contributed by Xiaoyu Yao 
(cherry picked from commit caa636bf10)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-08-21 16:41:34 -07:00
Vinod Kumar Vavilapalli 45be1240d9 Creating 2.6.2 entries in CHANGES.txt files. 
(cherry picked from commit 33474939a0)
 2015-08-20 17:23:54 -07:00
Akira Ajisaka 5fb8ac18d1 HADOOP-12061. Incorrect command in single cluster setup document. Contributed by Kengo Seki. 2015-08-20 11:11:12 +09:00
Robert Kanter acf241242d HADOOP-12317. Applications fail on NM restart on some linux distro because NM container recovery declares AM container as LOST (adhoot via rkanter) 
(cherry picked from commit 1e06299df8)
 2015-08-19 19:01:03 -07:00
Arpit Agarwal 10a0ddbac3 HDFS-8911. NameNode Metric : Add Editlog counters as a JMX metric. (Contributed by Anu Engineer) 2015-08-19 09:42:48 -07:00
Tsz-Wo Nicholas Sze 7245f7fad2 HDFS-8826. In Balancer, add an option to specify the source node list so that balancer only selects blocks to move from those nodes. 2015-08-18 19:26:58 -07:00
Chris Douglas 79af15fd37 HDFS-8435. Support CreateFlag in WebHDFS. Contributed by Jakob Homan 2015-08-18 17:33:21 -07:00
Benoy Antony d84e4a90d0 hadoop-12050. Enable MaxInactiveInterval for hadoop http auth token. Contributed by Huizhi Lu. 
(cherry picked from commit 71aedfabf3)
 2015-08-18 13:53:47 -07:00
Allen Wittenauer 40d8faf868 HADOOP-9891. CLIMiniCluster instructions fail with MiniYarnCluster ClassNotFoundException (Darrell Taylor via aw) 
(cherry picked from commit 4d8fb8c19c)
 2015-08-18 12:32:09 -07:00
Arpit Agarwal 85cb596e2e HDFS-8880. NameNode metrics logging. (Arpit Agarwal) 2015-08-17 16:55:24 -07:00
Xiaoyu Yao 27ccbd51f6 HDFS-8883. NameNode Metrics : Add FSNameSystem lock Queue Length. Contributed by Anu Engineer. 
(cherry picked from commit a7862d5fe4)
 2015-08-17 10:23:56 -07:00
Vinayakumar B eef0526127 HADOOP-7139. Allow appending to existing SequenceFiles (Contributed by kanaka kumar avvaru) 
Moved to 2.6.1

(cherry picked from commit fc508b41a9)
 2015-08-14 15:55:45 +05:30
Vinayakumar B 796b94df1e HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via cmccabe) 
Moved to 2.6.1

(cherry picked from commit 05ed69058f)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2015-08-14 12:55:25 +05:30
Vinayakumar B a6ec5c3dec HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu. 
Moved CHANGES.txt entry to 2.6.1

(cherry picked from commit e7aa81394d)
 2015-08-14 12:24:29 +05:30
Vinayakumar B e0b1744de9 HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu. 
Moved CHANGES.txt entry to 2.6.1

(cherry picked from commit d6050f06a3b7e049541b1cb4597c388abf00a5be)
 2015-08-14 12:10:22 +05:30
Arpit Agarwal 25c4dab891 HADOOP-12322. Typos in rpcmetrics.java. (Contributed by Anu Engineer) 2015-08-13 21:17:39 -07:00
yliu 073cb16d81 HADOOP-12295. Improve NetworkTopology#InnerNode#remove logic. (yliu) 2015-08-13 16:42:40 +08:00
cnauroth bf8b09d4b8 HADOOP-12258. Need translate java.nio.file.NoSuchFileException to FileNotFoundException to avoid regression. Contributed by Zhihai Xu. 
(cherry picked from commit 6cc8e38db5)
 2015-08-12 16:45:05 -07:00
Aaron T. Myers 43f386e748 HADOOP-12318. Expose underlying LDAP exceptions in SaslPlainServer. Contributed by Mike Yoder. 
(cherry picked from commit 28ea4c068ea0152af682058b02311bba81780770)
 2015-08-12 15:16:36 -07:00
Andrew Wang d53296281a HDFS-8887. Expose storage type and storage ID in BlockLocation. 
(cherry picked from commit 1ea1a8334e)
 2015-08-11 23:33:06 -07:00
Xuan 2ebdf5bfce YARN-3999. RM hangs on draing events. Contributed by Jian He 
(cherry picked from commit 3ae716fa69)
 2015-08-11 18:26:00 -07:00
Jian He 5950c1f6f8 HADOOP-11932. MetricsSinkAdapter may hang when being stopped. Contributed by Brahma Reddy Battula 
(cherry picked from commit f59612edd7)
 2015-08-05 16:14:09 -07:00
cnauroth b83d475252 HADOOP-12304. Applications using FileContext fail with the default file system configured to be wasb/s3/etc. Contributed by Chris Nauroth. 
(cherry picked from commit 3da0bedaec)
 2015-08-05 14:56:54 -07:00
Colin Patrick Mccabe e2d46ac5a4 HADOOP-12302. Fix native compilation on Windows after HADOOP-7824 (Vinayakumar B via Colin P. McCabe) 
(cherry picked from commit 4ab49a4365)
 2015-08-05 10:01:32 -07:00
Colin Patrick Mccabe e92107b18f HADOOP-12280. Skip unit tests based on maven profile rather than NativeCodeLoader.isNativeCodeLoaded (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 6f83274afc)
 2015-08-05 09:43:03 -07:00
Akira Ajisaka e55eb6f20c HADOOP-12274. Remove direct download link from BULIDING.txt. Contributed by Caleb Severn. 
(cherry picked from commit 52f3525586)
 2015-08-05 17:47:43 +09:00
Lei Xu f7b0f292e7 HADOOP-12269. Update aws-sdk dependency to 1.10.6 (Thomas Demoor via Lei (Eddy) Xu) 
(cherry picked from commit d5403747b5)
 2015-08-04 18:56:07 -07:00
Zhihai Xu b9ec7f15d0 HADOOP-12268. AbstractContractAppendTest#testRenameFileBeingAppended misses rename operation. Contributed by Zhihai Xu 
(cherry picked from commit a628a6f126)
 2015-07-31 21:47:34 -07:00
Colin Patrick Mccabe 7d68f17731 HADOOP-12183. Annotate the HTrace span created by FsShell with the command-line arguments passed by the user (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 454da959c7)
 2015-07-31 15:14:35 -07:00
Colin Patrick Mccabe 07a042aa3c HADOOP-7824. NativeIO.java flags and identifiers must be set correctly for each platform, not hardcoded to their Linux values (Martin Walsh via Colin P. McCabe) 
(cherry picked from commit 21d10ccc6e)
 2015-07-31 15:02:01 -07:00
Harsh J 68034bd6c2 HADOOP-12271. Hadoop Jar Error Should Be More Explanatory. Contributed by Josh Elser. 
(cherry picked from commit 2087eaf684)
 2015-07-31 10:13:07 +05:30
Jason Lowe e6b4714d0b HADOOP-10945. 4-digit octal umask permissions throws a parse error. Contributed by Chang Li 
(cherry picked from commit 6f0a35724f)
 2015-07-29 15:25:59 +00:00
Akira Ajisaka dff49aee08 Revert "HDFS-6682. Add a metric to expose the timestamp of the oldest under-replicated block. (aajisaka)" 
This reverts commit 17319c4a65.
 2015-07-29 16:52:54 +09:00
Jakob Homan 71a5aa267d HDFS-8180. AbstractFileSystem Implementation for WebHdfs. Contributed by Sathosh G Nayak. 
(cherry picked from commit 0712a8103f)
 2015-07-28 21:11:02 -07:00
Colin Patrick Mccabe 5875935669 HADOOP-12175. FsShell must load SpanReceierHost to support tracing (Masatake Iwasaki via Colin P. McCabe) 
(cherry picked from commit 69b095730b)
 2015-07-28 12:56:36 -07:00
Arun Suresh ffe6a34d5b HDFS-7858. Improve HA Namenode Failover detection on the client. (asuresh) 
(cherry picked from commit 030fcfa99c)
 2015-07-27 23:03:34 -07:00