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 2024/03/28 22:26:01 UTC

(guacamole-client) branch next updated (fe220e24e -> 5d547a84f)

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

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


    from fe220e24e Merge main branch changes to next branch.
     add 455c05aa3 GUACAMOLE-1931: Add configuration option to allow overwriting recording files.
     add 5a135f336 GUACAMOLE-1931: Merge addition of configuration option to allow overwriting of recording files.
     new 5d547a84f Merge changes from main branch to next.

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:
 .../main/resources/org/apache/guacamole/protocols/kubernetes.json   | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/rdp.json      | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json      | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/telnet.json   | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/vnc.json      | 5 +++++
 guacamole/src/main/frontend/src/translations/en.json                | 6 ++++++
 6 files changed, 31 insertions(+)

(guacamole-client) 01/01: Merge changes from main branch to next.

Posted by mj...@apache.org.

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

commit 5d547a84f95147fb48d2ebb599b347ad90c36b59
Merge: fe220e24e 5a135f336
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu Mar 28 14:48:18 2024 -0700

    Merge changes from main branch to next.

 .../main/resources/org/apache/guacamole/protocols/kubernetes.json   | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/rdp.json      | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json      | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/telnet.json   | 5 +++++
 .../src/main/resources/org/apache/guacamole/protocols/vnc.json      | 5 +++++
 guacamole/src/main/frontend/src/translations/en.json                | 6 ++++++
 6 files changed, 31 insertions(+)