Skip to content

Commit 3eaeaa5

Browse files
committed
Merge remote-tracking branch 'upstream/master' into pushPredicateThroughWindowNewNewNew
2 parents c4dedd2 + d0ca579 commit 3eaeaa5

File tree

1,119 files changed

+12411
-11947
lines changed

Some content is hidden

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

1,119 files changed

+12411
-11947
lines changed

R/pkg/NAMESPACE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ export("setJobGroup",
2424
"clearJobGroup",
2525
"cancelJobGroup")
2626

27-
exportClasses("DataFrame")
27+
# Export Utility methods
28+
export("setLogLevel")
29+
30+
exportClasses("SparkDataFrame")
2831

2932
exportMethods("arrange",
3033
"as.data.frame",
@@ -126,6 +129,7 @@ exportMethods("%in%",
126129
"between",
127130
"bin",
128131
"bitwiseNOT",
132+
"bround",
129133
"cast",
130134
"cbrt",
131135
"ceil",

0 commit comments

Comments
 (0)