Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks

MariaDB · Apr 4, 2017 · fb0b364 · fb0b364
2 parents c85ea1a + 6d417a0
commit fb0b364
Show file tree

Hide file tree

Showing 17 changed files with 1,965 additions and 151 deletions.
diff --git 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