Squashed commit of the following:
commit bb598b101da43b145bd4c95976e8decd39a02210
Merge: 54e730c c4cf523
Author: zen <xinjingziranchan@gmail.com>
Date: Thu Dec 24 10:53:42 2020 +0800
Merge remote-tracking branch 'origin/pr2-engine-scope' into pr2-engine-scope
# Conflicts:
# externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
commit 54e730c5b26ffb147e5c1266bdd036460cc20d82
Merge: 62d1575
|
||
|---|---|---|
| .. | ||
| src | ||
| pom.xml | ||