[guacamole-client] branch master updated (95f10f5 -> 1623f55)

2019-05-05 Thread mjumper
This is an automated email from the ASF dual-hosted git repository.

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


from 95f10f5  GUACAMOLE-783: Merge ensure GET requests to REST API are not 
cached in IE.
 add e1fea88  GUACAMOLE-696: In JDBC module, merge effective groups.
 add 9158ca6  GUACAMOLE-696: Use Guava Sets to combine the user groups.
 add 4d1e0f1  GUACAMOLE-696: Merge changes taking database groups into 
account with respect to database objects when user is otherwise external to the 
database.
 new 1623f55  Merge 1.1.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:
 .../apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java  | 7 +++
 1 file changed, 7 insertions(+)



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

2019-05-05 Thread mjumper
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 1623f55191d0486b59fffd216fc2ae0d2cc57021
Merge: 95f10f5 4d1e0f1
Author: Michael Jumper 
AuthorDate: Sun May 5 19:39:21 2019 -0700

Merge 1.1.0 changes back to master.

 .../apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java  | 7 +++
 1 file changed, 7 insertions(+)



[guacamole-client] 01/01: GUACAMOLE-696: Merge changes taking database groups into account with respect to database objects when user is otherwise external to the database.

2019-05-05 Thread mjumper
This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit 4d1e0f18ddb407c3bba85a55dd9ff6f49ba67bdd
Merge: 2140bed 9158ca6
Author: Mike Jumper 
AuthorDate: Sun May 5 19:36:37 2019 -0700

GUACAMOLE-696: Merge changes taking database groups into account with 
respect to database objects when user is otherwise external to the database.

 .../apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java  | 7 +++
 1 file changed, 7 insertions(+)



[guacamole-client] branch staging/1.1.0 updated (2140bed -> 4d1e0f1)

2019-05-05 Thread mjumper
This is an automated email from the ASF dual-hosted git repository.

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


from 2140bed  GUACAMOLE-715: Merge correct non-recursive MySQL/MariaDB 
effective group membership query
 add e1fea88  GUACAMOLE-696: In JDBC module, merge effective groups.
 add 9158ca6  GUACAMOLE-696: Use Guava Sets to combine the user groups.
 new 4d1e0f1  GUACAMOLE-696: Merge changes taking database groups into 
account with respect to database objects when user is otherwise external to the 
database.

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:
 .../apache/guacamole/auth/jdbc/user/ModeledAuthenticatedUser.java  | 7 +++
 1 file changed, 7 insertions(+)