Merge branch 'master' into jdbc-timestamp-no-calendar

kszucs · Feb 3, 2019 · cd9a230 · cd9a230
2 parents 089cff4 + 509a1cc
commit cd9a230
Show file tree

Hide file tree

Showing 1,628 changed files with 125,440 additions and 49,362 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -17,6 +17,7 @@
 
 .git
 docker_cache
+docs/_build
 
 # IDE
 .vscode
@@ -49,7 +50,6 @@ python/dist
 python/*.egg-info
 python/*.egg
 python/*.pyc
-python/doc/_build
 __pycache__/
 */__pycache__/
 */*/__pycache__/

diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
+apache-rat-*.jar
+arrow-src.tar
+arrow-src.tar.gz
+
 # Compiled source
 *.a
 *.dll
@@ -26,15 +30,27 @@
 .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/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,6 +21,14 @@
 # To run all hooks on all files use `pre-commit run -a`
 
 repos:
+  - repo: local
+    hooks:
+      - id: rat
+        name: rat
+        language: system
+        entry: bash -c "git archive HEAD --prefix=apache-arrow/ --output=arrow-src.tar && ./dev/release/run-rat.sh arrow-src.tar"
+        always_run: true
+        pass_filenames: false
   - repo: git://github.com/pre-commit/pre-commit-hooks
     sha: v1.2.3
     hooks: