[guacamole-client] branch master updated (4df22ce -> ee6a799)

[vn...@apache.org]

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 4df22ce  Merge 1.1.0 changes back to master.
     add 092657a  GUACAMOLE-422: Replace non-short-circuit logic in null check (`&`) with proper short-circuit logic (`&&`).
     add 203c4d9  GUACAMOLE-422: Merge correct non-short-circuit logic in null check.
     new ee6a799  Merge 1.1.0 changes bcak 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:
 .../main/java/org/apache/guacamole/tunnel/TunnelRequestService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[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 ee6a79933e495b094a76d14595f1e895659076fe
Merge: 4df22ce 203c4d9
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Sat Jun 8 17:34:11 2019 -0400

    Merge 1.1.0 changes bcak to master.

 .../main/java/org/apache/guacamole/tunnel/TunnelRequestService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)