This is an automated email from the ASF dual-hosted git repository.
jmalkin pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/datasketches-spark.git
from 2cc419b Merge pull request #7 from apache/theta
add 84e010f fixed problems introduced while resolving a conflict
new 50220f6 Merge pull request #11 from apache/fixes_after_conflict
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/scala/org/apache/spark/sql/functions_ds.scala | 3 ++-
.../org/apache/spark/sql/registrar/DatasketchesFunctionRegistry.scala | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
