diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 10:53:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 10:53:56 +0200 |
| commit | 2daf3b14fe2aa9f0f126420beffcc8cb12b87d5e (patch) | |
| tree | 1a4e5184577cba470e4c325112a86046ddd5d24c /.gitignore | |
| parent | f37a56de3cb795883f5a799f6de9fc475d5feaae (diff) | |
| parent | 0b36c27e0c06b798b7322ab07d8464b69a7b716c (diff) | |
| download | mariadb-git-2daf3b14fe2aa9f0f126420beffcc8cb12b87d5e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7974a539ee0..d91bac43dee 100644 --- a/.gitignore +++ b/.gitignore @@ -244,6 +244,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 |