diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-12 03:36:45 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-12 03:37:13 +0200 |
| commit | 1c5ca7c1837b9db071cb2e791d6605f8806af0c1 (patch) | |
| tree | d8f4983bbb554cf6f2c43e1497313be061d471b7 /.gitignore | |
| parent | 9a4bc0d098a9fba03e88b80db0f921b5ee597123 (diff) | |
| parent | ab93a4d4df7206833fa4a8eb0aa47b8ba185da60 (diff) | |
| download | mariadb-git-1c5ca7c1837b9db071cb2e791d6605f8806af0c1.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0a7c6402d03..191dbe23fad 100644 --- a/.gitignore +++ b/.gitignore @@ -214,6 +214,7 @@ support-files/mysql.spec support-files/mysqld_multi.server support-files/wsrep.cnf support-files/wsrep_notify +support-files/SELinux/centos6-mariadb.pp tags tests/async_queries tests/bug25714 |