Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ac3a35bc973a20d87289f262f94bc3093fe26b48 https://github.com/phpmyadmin/phpmyadmin/commit/ac3a35bc973a20d87289f262f94b... Author: Craig Duncan git@duncanc.co.uk Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths: M libraries/DatabaseInterface.php
Log Message: ----------- Correct the check for Amazon RDS
Signed-off-by: Craig Duncan git@duncanc.co.uk
Commit: fba8a51e3e607da42b6abadb8e0ebcccf7845279 https://github.com/phpmyadmin/phpmyadmin/commit/fba8a51e3e607da42b6abadb8e0e... Author: Michal Čihař michal@cihar.com Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths: M ChangeLog
Log Message: ----------- Changelog entry for #13258
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 17599c3387d8b3c62893db923b8f8acbc4b0d3d6 https://github.com/phpmyadmin/phpmyadmin/commit/17599c3387d8b3c62893db923b8f... Author: Michal Čihař michal@cihar.com Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths: M libraries/DatabaseInterface.php
Log Message: ----------- Simplify Amazon RDS detection
Issue #13258
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 61b9418f67c55789ab9a7a2ff7fe01d4af5c2578 https://github.com/phpmyadmin/phpmyadmin/commit/61b9418f67c55789ab9a7a2ff7fe... Author: Michal Čihař michal@cihar.com Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths: M test/classes/DatabaseInterfaceTest.php
Log Message: ----------- Add tests for Amazon RDS
Issue #13258
Signed-off-by: Michal Čihař michal@cihar.com
Commit: dbcbee5336cfe3b564e56d53da6cf26c06559ea4 https://github.com/phpmyadmin/phpmyadmin/commit/dbcbee5336cfe3b564e56d53da6c... Author: Michal Čihař michal@cihar.com Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths: R composer.lock
Log Message: ----------- Remove composer.lock from maintenance branch
It should be there only for releases.
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 6b45f57e45e2ecb10324589b2da8fe42935a241a https://github.com/phpmyadmin/phpmyadmin/commit/6b45f57e45e2ecb10324589b2da8... Author: Michal Čihař michal@cihar.com Date: 2017-05-09 (Tue, 09 May 2017)
Changed paths: M ChangeLog M libraries/DatabaseInterface.php M test/classes/DatabaseInterfaceTest.php
Log Message: ----------- Merge branch 'QA_4_7'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/71fdc68827d6...6b45f57e45e2
-
Michal Čihař