summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2017-04-04 17:12:06 +0300
committerSergei Petrunia <psergey@askmonty.org>2017-04-04 17:12:06 +0300
commitfb0b3640fe2616f8f3168f8e487bb04f757e3eb1 (patch)
tree2b14836d33539764be4651b4b143dc5e29cff6fb /.gitignore
parentc85ea1ab6d276f90b7b73d99cf357e11ea103822 (diff)
parent6d417a0bad205a6bacfee10dbc46dd631b093e75 (diff)
downloadmariadb-git-fb0b3640fe2616f8f3168f8e487bb04f757e3eb1.tar.gz
Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 366842b24be..469aa0d894b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,9 @@ pcre/pcre_chartables.c
pcre/pcregrep
pcre/pcretest
pcre/test*grep
+plugin/aws_key_management/aws-sdk-cpp
+plugin/aws_key_management/aws_sdk_cpp
+plugin/aws_key_management/aws_sdk_cpp-prefix
scripts/comp_sql
scripts/make_binary_distribution
scripts/msql2mysql