Merge branch 'branch-25.02' into dump_write_data

NVIDIA · Dec 13, 2024 · da82373 · da82373
2 parents b5403c4 + 561068c
commit da82373
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,5 @@ scalastyle-output.xml
 scalastyle.txt
 target/
 cufile.log
+cudf_log.txt
 build/*.class
diff --git a/pom.xml b/pom.xml
@@ -1645,6 +1645,7 @@ This will force full Scala code rebuild in downstream modules.
                         default, but there are some projects that are conditionally included.  -->
                         <exclude>**/target/**/*</exclude>
                         <exclude>**/cufile.log</exclude>
+                        <exclude>**/cudf_log.txt</exclude>
                         <exclude>thirdparty/parquet-testing/**</exclude>
                     </excludes>
                 </configuration>

diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
@@ -1645,6 +1645,7 @@ This will force full Scala code rebuild in downstream modules.
                         default, but there are some projects that are conditionally included.  -->
                         <exclude>**/target/**/*</exclude>
                         <exclude>**/cufile.log</exclude>
+                        <exclude>**/cudf_log.txt</exclude>
                         <exclude>thirdparty/parquet-testing/**</exclude>
                     </excludes>
                 </configuration>