Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9d0c745aa528923b59a50a58f9b453728de2845c https://github.com/phpmyadmin/phpmyadmin/commit/9d0c745aa528923b59a50a58f9b4... Author: Michal Čihař michal@cihar.com Date: 2016-07-29 (Fri, 29 Jul 2016)
Changed paths: M libraries/DatabaseInterface.php
Log Message: ----------- Add missing documentation
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 4054228e1b97da9e802b3381c2911089e764e7f2 https://github.com/phpmyadmin/phpmyadmin/commit/4054228e1b97da9e802b3381c291... Author: Michal Čihař michal@cihar.com Date: 2016-07-29 (Fri, 29 Jul 2016)
Changed paths: M libraries/DatabaseInterface.php
Log Message: ----------- Always merge control user configuration
Issue #12218
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 43cfaeeade02308994a4bfcb0a09edb7acb5ac17 https://github.com/phpmyadmin/phpmyadmin/commit/43cfaeeade02308994a4bfcb0a09... Author: Michal Čihař michal@cihar.com Date: 2016-07-29 (Fri, 29 Jul 2016)
Changed paths: M test/classes/DatabaseInterfaceTest.php
Log Message: ----------- Add tests for control user connection fallbacks
Issue #12218
Signed-off-by: Michal Čihař michal@cihar.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6b6040acbf98...43cfaeeade02