Merge remote-tracking branch 'origin/master'

2013-02-20 08:55:27 +01:00 · 2013-02-20 08:55:27 +01:00 · 0831c644e1
commit 0831c644e1
parent c504b85b6d 199f1233d5
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -92,6 +92,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3827 Table specific privileges not displayed for db name containing
 underscore 
 - rfe #1386 Add IF NOT EXISTS clause when copying database
+- No longer package .travis.yml configuration file when creating a release.

 3.5.8.0 (not yet released)
 - bug #3828 MariaDB reported as MySQL
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@ -145,7 +145,7 @@ rm -rf test
 rm -rf PMAStandard

 # Testsuite setup
-rm -f build.xml phpunit.xml.dist
+rm -f build.xml phpunit.xml.dist .travis.yml

 # Remove readme for github
 rm -f README.rst