You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2020/11/01 00:47:11 UTC

[guacamole-client] branch master updated (2ea29c5 -> 7bcdc94)

This is an automated email from the ASF dual-hosted git repository.

vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.


    from 2ea29c5  Merge 1.3.0 changes back to master.
     add a37e0ac  GUACAMOLE-1021: Refactor PostgreSQL queries to NOT duplicate results across related entities.
     add 349fc36  GUACAMOLE-1021: Refactor MySQL queries to NOT duplicate results across related entities.
     add 624d498  GUACAMOLE-1021: Refactor SQL Server queries to NOT duplicate results across related entities.
     add ada45ce  GUACAMOLE-1021: Merge do not duplicate objects when permissions are inherited from multiple entities.
     new 7bcdc94  Merge 1.3.0 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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(-)


[guacamole-client] 01/01: Merge 1.3.0 changes back to master.

Posted by vn...@apache.org.
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(-)