You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by mj...@apache.org on 2023/03/15 18:24:04 UTC

[guacamole-server] branch master updated (47b9360d -> 1ff7dd55)

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


    from 47b9360d GUACAMOLE-1714: Merge update guacenc for const parameters/values introduced in FFmpeg 5.0.
     add f906b14f GUACAMOLE-1741: Build Docker image against OpenSSL 1.1 for VNC compatibility
     add 6fb3aa4f GUACAMOLE-1741: Merge changes migrating Docker image to OpenSSL 1.1 for sake of VNC.
     new 1ff7dd55 Merge 1.5.1 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:
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[guacamole-server] 01/01: Merge 1.5.1 changes back to master.

Posted by mj...@apache.org.

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

commit 1ff7dd557767d3a7f488fbf4bc9590c333aee38b
Merge: 47b9360d 6fb3aa4f
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Wed Mar 15 11:23:41 2023 -0700

    Merge 1.5.1 changes back to master.

 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)