diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 13:49:14 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-05-07 13:49:14 +0300 |
| commit | 648cf7176cc95f697abd8b94e860c74768680298 (patch) | |
| tree | 8f3d19e0f1bd607cb515111f106715f9a4e6fcec /.gitignore | |
| parent | 7b115181987fb88b97ef6d3d88bb16bdbc281e40 (diff) | |
| parent | 1ecd68d867ced1d00ebffdcedbf6bc97493f5067 (diff) | |
| download | mariadb-git-648cf7176cc95f697abd8b94e860c74768680298.tar.gz | |
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f1c300a89c6..a328a85b8cc 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ scripts/mytop scripts/wsrep_sst_common scripts/wsrep_sst_mysqldump scripts/wsrep_sst_rsync +scripts/wsrep_sst_rsync_wan scripts/wsrep_sst_xtrabackup scripts/wsrep_sst_xtrabackup-v2 sql-bench/bench-count-distinct |