This is an automated email from the ASF dual-hosted git repository.

srowen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 428eb2a  [SPARK-26394][CORE] Fix annotation error for 
Utils.timeStringAsMs
428eb2a is described below

commit 428eb2ad0ad8a141427120b13de3287962258c2d
Author: Jackey Lee <qcsd2...@163.com>
AuthorDate: Tue Dec 18 12:15:36 2018 -0600

    [SPARK-26394][CORE] Fix annotation error for Utils.timeStringAsMs
    
    ## What changes were proposed in this pull request?
    
    Change microseconds to milliseconds in annotation of Utils.timeStringAsMs.
    
    Closes #23346 from stczwd/stczwd.
    
    Authored-by: Jackey Lee <qcsd2...@163.com>
    Signed-off-by: Sean Owen <sean.o...@databricks.com>
---
 core/src/main/scala/org/apache/spark/util/Utils.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala 
b/core/src/main/scala/org/apache/spark/util/Utils.scala
index b4ea1ee..143abd3 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -1037,7 +1037,7 @@ private[spark] object Utils extends Logging {
   }
 
   /**
-   * Convert a time parameter such as (50s, 100ms, or 250us) to microseconds 
for internal use. If
+   * Convert a time parameter such as (50s, 100ms, or 250us) to milliseconds 
for internal use. If
    * no suffix is provided, the passed number is assumed to be in ms.
    */
   def timeStringAsMs(str: String): Long = {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to