GUACAMOLE-136: Merge password reset flow fix for 2FA.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/18565d17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/18565d17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/18565d17 Branch: refs/heads/master Commit: 18565d171e26d700b126f56bbf73950c57638096 Parents: 32e5c3e 4a1ffbf Author: James Muehlner <[email protected]> Authored: Mon Dec 5 20:43:39 2016 -0800 Committer: James Muehlner <[email protected]> Committed: Mon Dec 5 20:43:39 2016 -0800 ---------------------------------------------------------------------- .../jdbc/JDBCAuthenticationProviderService.java | 6 ++ .../guacamole/auth/jdbc/user/UserService.java | 90 ++++++++++++-------- 2 files changed, 62 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
