Merge pull request #11058 from NVIDIA/merge-branch-24.06-to-main

Merge branch-24.06 into main [skip ci]
NVIDIA · Jun 13, 2024 · f932a78 · f932a78
2 parents 31b4c07 + 8786de9
commit f932a78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Change log
-Generated on 2024-06-10
+Generated on 2024-06-13
 
 ## Release 24.06
 
@@ -48,6 +48,8 @@ Generated on 2024-06-10
 ### PRs
 |||
 |:---|:---|
+|[#11052](https://github.com/NVIDIA/spark-rapids/pull/11052)|Add spark343 shim for scala2.13 dist jar|
+|[#10981](https://github.com/NVIDIA/spark-rapids/pull/10981)|Update latest changelog [skip ci]|
 |[#10984](https://github.com/NVIDIA/spark-rapids/pull/10984)|[DOC] Update docs for 24.06.0 release [skip ci]|
 |[#10974](https://github.com/NVIDIA/spark-rapids/pull/10974)|Update rapids JNI and private dependency to 24.06.0|
 |[#10947](https://github.com/NVIDIA/spark-rapids/pull/10947)|Prevent contains-PrefixRange optimization if not preceded by wildcards|

diff --git a/pom.xml b/pom.xml
@@ -886,6 +886,7 @@
             340,
             341,
             342,
+            343,
             350,
             351
         </noSnapshotScala213.buildvers>

diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
@@ -886,6 +886,7 @@
             340,
             341,
             342,
+            343,
             350,
             351
         </noSnapshotScala213.buildvers>
-Original file line number
+Diff line change
@@ Expand Up / @@ -886,6 +886,7 @@ @@
 ,
 ,
 ,
+,
 ,
             </noSnapshotScala213.buildvers>
@@ Expand Down @@