This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git

commit fae91a9d56887061faa92a05e4936764d2348091
Merge: c7ac6960 7553e793
Author: Michael Jumper <[email protected]>
AuthorDate: Thu Mar 28 15:27:03 2024 -0700

    Merge changes from main branch to next.

 src/libguac/guacamole/recording.h     |  6 +++++-
 src/libguac/recording.c               | 35 +++++++++++++++++++++--------------
 src/protocols/kubernetes/kubernetes.c |  3 ++-
 src/protocols/kubernetes/settings.c   | 12 ++++++++++++
 src/protocols/kubernetes/settings.h   |  6 ++++++
 src/protocols/rdp/rdp.c               |  3 ++-
 src/protocols/rdp/settings.c          | 12 ++++++++++++
 src/protocols/rdp/settings.h          |  6 ++++++
 src/protocols/ssh/settings.c          | 12 ++++++++++++
 src/protocols/ssh/settings.h          |  6 ++++++
 src/protocols/ssh/ssh.c               |  3 ++-
 src/protocols/telnet/settings.c       | 12 ++++++++++++
 src/protocols/telnet/settings.h       |  6 ++++++
 src/protocols/telnet/telnet.c         |  3 ++-
 src/protocols/vnc/settings.c          | 12 ++++++++++++
 src/protocols/vnc/settings.h          |  6 ++++++
 src/protocols/vnc/vnc.c               |  3 ++-
 17 files changed, 126 insertions(+), 20 deletions(-)

Reply via email to