Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 26e96680f456df92d04d0ad0e04688d3cedcfa4e https://github.com/phpmyadmin/phpmyadmin/commit/26e96680f456df92d04d0ad0e046... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-12-02 (Wed, 02 Dec 2015)

Changed paths: M test/classes/config/PageSettingsTest.php M test/classes/controllers/ServerDatabasesControllerTest.php M test/classes/controllers/ServerVariablesControllerTest.php

Log Message: ----------- Fix some test failures

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 34b03a3494dddf942a70c5292154aa58a5ea08b3 https://github.com/phpmyadmin/phpmyadmin/commit/34b03a3494dddf942a70c5292154... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-12-02 (Wed, 02 Dec 2015)

Changed paths: M .travis.yml M ChangeLog M composer.json M index.php M libraries/dbi/DBIDummy.php M libraries/plugins/auth/AuthenticationHttp.php M libraries/properties/options/OptionsPropertyOneItem.php M libraries/properties/options/groups/OptionsPropertySubgroup.php M phpunit.xml.dist M phpunit.xml.hhvm M phpunit.xml.nocoverage M test/classes/PMA_StringTest.php M test/classes/UtilTest.php M test/classes/controllers/ServerDatabasesControllerTest.php M test/classes/controllers/TableStructureControllerTest.php M test/classes/gis/GISLinestringTest.php M test/classes/gis/GISMultilinestringTest.php M test/classes/gis/GISMultipointTest.php M test/classes/gis/GISMultipolygonTest.php M test/classes/gis/GISPointTest.php M test/classes/gis/GISPolygonTest.php M test/classes/navigation/NodeTest.php M test/classes/properties/plugins/ExportPluginPropertiesTest.php M test/libraries/PMA_operations_test.php M test/libraries/rte/PMA_TRI_getEditorForm_test.php M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/45284ed3ad95...34b03a3494dd