Skip to content

Commit 167ccb4

Browse files
committed
Merge remote-tracking branch 'origin/jcowell/no-issue-query-state-machine' into jcowell/SPARK-51731-query-state-machine
# Conflicts: # sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala # sql/connect/common/src/main/scala/org/apache/spark/sql/connect/StreamingQueryListenerBus.scala # sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/runtime/ProgressReporter.scala # sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingQueryListenerSuite.scala
2 parents 1d87cb3 + de8d40b commit 167ccb4

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)