summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-02-12 08:55:17 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-02-12 08:55:17 +0100
commit4b087e175431895bd5a69cb298281f0c30a1d2a6 (patch)
tree17a5b0e8f4a678f46ff1e1b1faabcdfedacc5ffe /.gitignore
parentfc2f2fa85306d80c317e76933264ba3d3675ed1c (diff)
parent646d1ec83a57d9a5b380079afc3612c1d9acadd5 (diff)
downloadmariadb-git-4b087e175431895bd5a69cb298281f0c30a1d2a6.tar.gz
Merge branch '10.4' into 10.5
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c86672b804f..d92073c0af4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -277,6 +277,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