[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 310019: Changelog entry for #11684

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31001963d2a64c250dae6f2e400653d3efc0a8e8 https://github.com/phpmyadmin/phpmyadmin/commit/31001963d2a64c250dae6f2e400… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #11684 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 8eb712579d67ebcc31210aca7320279494d8e62a https://github.com/phpmyadmin/phpmyadmin/commit/8eb712579d67ebcc31210aca732… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.class.php Log Message: ----------- Fixes #11693 : Flush privileges overusage - related to issue 11597 Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Commit: 77f220cee5020759c9056ac2bec6a64e648e53f7 https://github.com/phpmyadmin/phpmyadmin/commit/77f220cee5020759c9056ac2bec… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M ChangeLog M libraries/check_user_privileges.lib.php M libraries/plugins/auth/AuthenticationCookie.php Log Message: ----------- Merge branch 'QA_4_5' Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com> Conflicts: libraries/plugins/auth/AuthenticationCookie.php Commit: bc0eda093634b5daf848b879633a5fb040e357e7 https://github.com/phpmyadmin/phpmyadmin/commit/bc0eda093634b5daf848b879633… Author: Deven Bansod <devenbansod.bits(a)gmail.com> Date: 2015-11-26 (Thu, 26 Nov 2015) Changed paths: M libraries/controllers/server/ServerDatabasesController.php M libraries/controllers/server/ServerVariablesController.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9416ff7c3f75...bc0eda093634