[guacamole-server] branch master updated (7563402 -> e3df475)

[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-server.git.


    from 7563402  Merge 1.3.0 changes back to master.
     add 1e550b5  GUACAMOLE-221: Ensure guacd always enables broadcast socket keep-alive.
     add c48feb3  GUACAMOLE-221: Merge ensure guacd always enables broadcast socket keep-alive.
     new e3df475  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:
 src/guacd/proc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[guacamole-server] 01/01: Merge 1.3.0 changes back 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-server.git

commit e3df475bda8dbf2ba5eacb3c4fc5e962e8873b1f
Merge: 7563402 c48feb3
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Mon Nov 2 16:16:22 2020 -0500

    Merge 1.3.0 changes back to master.

 src/guacd/proc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)