Merge branch 'tag-wsrep_5.7.20-25.13' into pxc-rel-5.7.20

chinyajie · Dec 19, 2017 · 1152a64 · 1152a64
2 parents b1f6a3f + 6cfed4d
commit 1152a64
Show file tree

Hide file tree

Showing 249 changed files with 2,562 additions and 25,990 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,6 +37,7 @@
 *.sbr
 *.so
 *.so.*
+*.spec
 *.user
 *.vcproj
 *.vcproj.cmake

diff --git a/codership-debian/README.Maintainer b/codership-debian/README.Maintainer
diff --git a/codership-debian/additions/Docs__Images__Makefile.in b/codership-debian/additions/Docs__Images__Makefile.in
diff --git a/codership-debian/additions/Docs__Makefile.in b/codership-debian/additions/Docs__Makefile.in
diff --git a/codership-debian/additions/debian-start b/codership-debian/additions/debian-start
diff --git a/codership-debian/additions/debian-start.inc.sh b/codership-debian/additions/debian-start.inc.sh
diff --git a/codership-debian/additions/debian_create_root_user.sql b/codership-debian/additions/debian_create_root_user.sql
diff --git a/codership-debian/additions/echo_stderr b/codership-debian/additions/echo_stderr
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,7 @@ @@
     *.sbr
     *.so
     *.so.*
+    *.spec
     *.user
     *.vcproj
     *.vcproj.cmake
@@ Expand Down @@