[guacamole-server] branch master updated (28f7d36 -> 0aecca3)

[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 28f7d36  Merge 1.1.0 changes back to master.
     add 8ebe5c5  GUACAMOLE-935: Do not assign SVC plugin context as it may be automatically freed.
     add a054073  GUACAMOLE-935: Merge do not assign SVC plugin context as it may be automatically freed.
     new 0aecca3  Merge staging/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:
 src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[guacamole-server] 01/01: Merge staging/1.1.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 0aecca3e043ed8a3400c960af1dd4dedefe7d01a
Merge: 28f7d36 a054073
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Wed Jan 22 16:25:39 2020 -0500

    Merge staging/1.1.0 changes back to master.

 src/protocols/rdp/plugins/guac-common-svc/guac-common-svc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)