Skip to content

Commit cd9a230

Browse files
author
Mike Pigott
committed
Merge branch 'master' into jdbc-timestamp-no-calendar
2 parents 089cff4 + 509a1cc commit cd9a230

File tree

1,628 files changed

+125440
-49362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,628 files changed

+125440
-49362
lines changed

.dockerignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
.git
1919
docker_cache
20+
docs/_build
2021

2122
# IDE
2223
.vscode
@@ -49,7 +50,6 @@ python/dist
4950
python/*.egg-info
5051
python/*.egg
5152
python/*.pyc
52-
python/doc/_build
5353
__pycache__/
5454
*/__pycache__/
5555
*/*/__pycache__/

.gitignore

+16
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18+
apache-rat-*.jar
19+
arrow-src.tar
20+
arrow-src.tar.gz
21+
1822
# Compiled source
1923
*.a
2024
*.dll
@@ -26,15 +30,27 @@
2630
.build_cache_dir
2731
dependency-reduced-pom.xml
2832
MANIFEST
33+
compile_commands.json
34+
build.ninja
2935

3036
# Generated Visual Studio files
3137
*.vcxproj
3238
*.vcxproj.*
3339
*.sln
3440
*.iml
3541

42+
# Linux perf sample data
43+
perf.data
44+
perf.data.old
45+
3646
cpp/.idea/
47+
cpp/apidoc/xml/
48+
docs/example.gz
49+
docs/example1.dat
50+
docs/example3.dat
3751
python/.eggs/
52+
python/doc/
53+
3854
.vscode
3955
.idea/
4056
.pytest_cache/

.pre-commit-config.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
# To run all hooks on all files use `pre-commit run -a`
2222

2323
repos:
24+
- repo: local
25+
hooks:
26+
- id: rat
27+
name: rat
28+
language: system
29+
entry: bash -c "git archive HEAD --prefix=apache-arrow/ --output=arrow-src.tar && ./dev/release/run-rat.sh arrow-src.tar"
30+
always_run: true
31+
pass_filenames: false
2432
- repo: git://github.com/pre-commit/pre-commit-hooks
2533
sha: v1.2.3
2634
hooks:

0 commit comments

Comments
 (0)