This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit ea1b10e9d1e3f1fa640dff2ca64d61b44bf1ace9 Merge: f170b7e 60ff499 Author: Michael Jumper <mjum...@apache.org> AuthorDate: Tue Apr 9 11:11:50 2019 -0700 Merge 1.1.0 changes back to master. .../jdbc/JDBCAuthenticationProviderService.java | 24 +++++++------- .../apache/guacamole/auth/jdbc/user/UserModel.java | 11 +++++++ .../guacamole/auth/jdbc/user/UserService.java | 37 ++++++++++++++++++++++ 3 files changed, 60 insertions(+), 12 deletions(-)