diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-06 17:43:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-06 17:43:02 +0200 |
| commit | 734510a44d690dfb94264e1d2775ee1cb6f3ebb9 (patch) | |
| tree | 0ccc317bf9462ca95cd1277b4ce65a7fda5fe315 /.gitignore | |
| parent | 2465d3e00b2f18c7d4967f9bb10438883682787d (diff) | |
| parent | faf206a848684bc0f87c93a2b47a55063bbccc6c (diff) | |
| download | mariadb-git-734510a44d690dfb94264e1d2775ee1cb6f3ebb9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 9c2e1d7a8c0..54fdfdae31b 100644 --- a/.gitignore +++ b/.gitignore @@ -129,8 +129,6 @@ scripts/wsrep_sst_mysqldump scripts/wsrep_sst_rsync scripts/wsrep_sst_rsync_wan scripts/wsrep_sst_mariabackup -scripts/wsrep_sst_xtrabackup -scripts/wsrep_sst_xtrabackup-v2 scripts/maria_add_gis_sp.sql scripts/maria_add_gis_sp_bootstrap.sql scripts/galera_new_cluster |