Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 073b85e1ee029aa5974e174cabc6e49f097fb40d https://github.com/phpmyadmin/phpmyadmin/commit/073b85e1ee029aa5974e174cabc6... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)

Changed paths: M test/libraries/PMA_ConfigGenerator_test.php

Log Message: ----------- Avoid matching of date

This causes random failures as time can be one second further when generating output.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: c90e01f4ce6e35aa2c137f40acc7f4a59cca37da https://github.com/phpmyadmin/phpmyadmin/commit/c90e01f4ce6e35aa2c137f40acc7... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)

Changed paths: M test/classes/ConfigGeneratorTest.php

Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/971e40d83962...c90e01f4ce6e