Merge branch 'master' into jdbc-column-metadata

apache · Feb 3, 2019 · 4a6de86 · 4a6de86
2 parents d847ebc + 509a1cc
commit 4a6de86
Show file tree

Hide file tree

Showing 1,394 changed files with 113,904 additions and 42,811 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@
 
 apache-rat-*.jar
 arrow-src.tar
+arrow-src.tar.gz
 
 # Compiled source
 *.a
@@ -29,17 +30,27 @@ arrow-src.tar
 .build_cache_dir
 dependency-reduced-pom.xml
 MANIFEST
+compile_commands.json
+build.ninja
 
 # Generated Visual Studio files
 *.vcxproj
 *.vcxproj.*
 *.sln
 *.iml
 
+# Linux perf sample data
+perf.data
+perf.data.old
+
 cpp/.idea/
 cpp/apidoc/xml/
+docs/example.gz
+docs/example1.dat
+docs/example3.dat
 python/.eggs/
 python/doc/
+
 .vscode
 .idea/
 .pytest_cache/