summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-01-31 11:37:12 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-01-31 11:37:12 +0200
commit5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea (patch)
treeb33d1e67c5a03abd85abe023f078d0201b12adeb /.gitignore
parentdbbe9961a53cad97544499c3187771df64f25b18 (diff)
parent256994ef7469fc4c62d5b271a6557ad729380f0e (diff)
downloadmariadb-git-5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 83d921fab98..76c2122428d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -246,6 +246,8 @@ support-files/mysqld_multi.server
support-files/wsrep.cnf
support-files/wsrep_notify
support-files/policy/selinux/mysqld-safe.pp
+support-files/sysusers.conf
+support-files/tmpfiles.conf
support-files/mariadb.pp
tags
tests/async_queries