Skip to content

Commit fac17a4

Browse files
committed
Merge remote-tracking branch 'apache/master' into console-sink
2 parents e4c6429 + 4371466 commit fac17a4

File tree

164 files changed

+2417
-2104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+2417
-2104
lines changed

R/pkg/DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: SparkR
22
Type: Package
3-
Version: 2.3.0
3+
Version: 2.4.0
44
Title: R Frontend for Apache Spark
55
Description: Provides an R Frontend for Apache Spark.
66
Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"),

R/pkg/R/DataFrame.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,10 +3054,10 @@ setMethod("describe",
30543054
#' \item stddev
30553055
#' \item min
30563056
#' \item max
3057-
#' \item arbitrary approximate percentiles specified as a percentage (eg, "75%")
3057+
#' \item arbitrary approximate percentiles specified as a percentage (eg, "75\%")
30583058
#' }
30593059
#' If no statistics are given, this function computes count, mean, stddev, min,
3060-
#' approximate quartiles (percentiles at 25%, 50%, and 75%), and max.
3060+
#' approximate quartiles (percentiles at 25\%, 50\%, and 75\%), and max.
30613061
#' This function is meant for exploratory data analysis, as we make no guarantee about the
30623062
#' backward compatibility of the schema of the resulting Dataset. If you want to
30633063
#' programmatically compute summary statistics, use the \code{agg} function instead.
@@ -4019,9 +4019,9 @@ setMethod("broadcast",
40194019
#'
40204020
#' Spark will use this watermark for several purposes:
40214021
#' \itemize{
4022-
#' \item{-} To know when a given time window aggregation can be finalized and thus can be emitted
4022+
#' \item To know when a given time window aggregation can be finalized and thus can be emitted
40234023
#' when using output modes that do not allow updates.
4024-
#' \item{-} To minimize the amount of state that we need to keep for on-going aggregations.
4024+
#' \item To minimize the amount of state that we need to keep for on-going aggregations.
40254025
#' }
40264026
#' The current watermark is computed by looking at the \code{MAX(eventTime)} seen across
40274027
#' all of the partitions in the query minus a user specified \code{delayThreshold}. Due to the cost

assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

common/kvstore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-shuffle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-yarn/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/sketch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/tags/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/unsafe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

0 commit comments

Comments
 (0)