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/01/18 11:18:03 UTC

[guacamole-server] branch master updated (fd2c5b9 -> cc8d879)

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 fd2c5b9  Merge staging/1.1.0 changes back to master.
     add 39f7d5a  GUACAMOLE-927: Automatically set $HOME for sake of FreeRDP initialization process.
     add 0676e70  GUACAMOLE-927: Abort RDP connection if FreeRDP fails to initialize.
     add a384e74  GUACAMOLE-927: Merge automatically set $HOME for sake of FreeRDP initialization process
     add 2c6be5a  GUACAMOLE-928: Keep all build artifacts of Docker image within /usr/local/guacamole, including FreeRDP plugins.
     add 77f6168  GUACAMOLE-928: Merge keep FreeRDP plugins of Docker image within /usr/local/guacamole
     new cc8d879  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/guacd-docker/bin/build-guacd.sh |  2 +-
 src/protocols/rdp/client.c          | 34 ++++++++++++++++++++++++++++++++++
 src/protocols/rdp/rdp.c             |  9 ++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

[guacamole-server] 01/01: Merge staging/1.1.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-server.git

commit cc8d879a12a3c19f8dd9aa1034d19ba720abe2ca
Merge: fd2c5b9 77f6168
Author: Nick Couchman <vn...@apache.org>
AuthorDate: Sat Jan 18 06:16:54 2020 -0500

    Merge staging/1.1.0 changes back to master.

 src/guacd-docker/bin/build-guacd.sh |  2 +-
 src/protocols/rdp/client.c          | 34 ++++++++++++++++++++++++++++++++++
 src/protocols/rdp/rdp.c             |  9 ++++++++-
 3 files changed, 43 insertions(+), 2 deletions(-)