This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 7bcdc945d612478a682cde88157047d56f62f566 Merge: 2ea29c5 ada45ce Author: Virtually Nick <vn...@apache.org> AuthorDate: Sat Oct 31 20:46:27 2020 -0400 Merge 1.3.0 changes back to master. .../auth/jdbc/connection/ConnectionMapper.xml | 83 +++++++++++-------- .../jdbc/connection/ConnectionRecordMapper.xml | 38 ++++----- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 96 +++++++++++++--------- .../permission/ConnectionGroupPermissionMapper.xml | 2 +- .../jdbc/permission/ConnectionPermissionMapper.xml | 2 +- .../permission/SharingProfilePermissionMapper.xml | 2 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 2 +- .../auth/jdbc/permission/UserPermissionMapper.xml | 2 +- .../jdbc/sharingprofile/SharingProfileMapper.xml | 57 ++++++++----- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++++++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 13 ++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 20 ++--- .../auth/jdbc/usergroup/UserGroupMapper.xml | 65 ++++++++++----- .../usergroup/UserGroupMemberUserGroupMapper.xml | 13 ++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 13 ++- .../auth/jdbc/connection/ConnectionMapper.xml | 83 +++++++++++-------- .../jdbc/connection/ConnectionRecordMapper.xml | 38 ++++----- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 96 +++++++++++++--------- .../permission/ConnectionGroupPermissionMapper.xml | 2 +- .../jdbc/permission/ConnectionPermissionMapper.xml | 2 +- .../permission/SharingProfilePermissionMapper.xml | 2 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 2 +- .../auth/jdbc/permission/UserPermissionMapper.xml | 2 +- .../jdbc/sharingprofile/SharingProfileMapper.xml | 57 ++++++++----- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++++++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 13 ++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 21 +++-- .../auth/jdbc/usergroup/UserGroupMapper.xml | 65 ++++++++++----- .../usergroup/UserGroupMemberUserGroupMapper.xml | 13 ++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 13 ++- .../auth/jdbc/connection/ConnectionMapper.xml | 83 +++++++++++-------- .../jdbc/connection/ConnectionRecordMapper.xml | 38 ++++----- .../jdbc/connectiongroup/ConnectionGroupMapper.xml | 96 +++++++++++++--------- .../permission/ConnectionGroupPermissionMapper.xml | 2 +- .../jdbc/permission/ConnectionPermissionMapper.xml | 2 +- .../permission/SharingProfilePermissionMapper.xml | 2 +- .../jdbc/permission/UserGroupPermissionMapper.xml | 2 +- .../auth/jdbc/permission/UserPermissionMapper.xml | 2 +- .../jdbc/sharingprofile/SharingProfileMapper.xml | 57 ++++++++----- .../apache/guacamole/auth/jdbc/user/UserMapper.xml | 65 ++++++++++----- .../auth/jdbc/user/UserParentUserGroupMapper.xml | 13 ++- .../guacamole/auth/jdbc/user/UserRecordMapper.xml | 20 ++--- .../auth/jdbc/usergroup/UserGroupMapper.xml | 65 ++++++++++----- .../usergroup/UserGroupMemberUserGroupMapper.xml | 13 ++- .../jdbc/usergroup/UserGroupMemberUserMapper.xml | 13 ++- .../usergroup/UserGroupParentUserGroupMapper.xml | 13 ++- 48 files changed, 862 insertions(+), 597 deletions(-)