Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'apache/master' into impl_percentile_approx
# Conflicts:
#
sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveSessionCatalog.sca
la
  • Loading branch information
lw-lin committed Jul 22, 2016
commit da87bfdb0ab91a265f74df01ec87221651583919
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ private[sql] class HiveSessionCatalog(
private val hiveFunctions = Seq(
"hash",
"histogram_numeric",
"percentile",
"str_to_map"
"percentile"
)
}
You are viewing a condensed version of this merge commit. You can view the full changes here.