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-client.git
commit 70315d6dcbe02c60bd31e79dae2e4f1d2bb04a71 Merge: e960827 ecd385b Author: Virtually Nick <vn...@apache.org> AuthorDate: Wed Nov 25 18:55:26 2020 -0500 Merge 1.3.0 changes back to master. .../tunnel/AbstractGuacamoleTunnelService.java | 100 +++++++-------------- .../src/main/webapp/modules/Tunnel.js | 36 +++++++- guacamole-common/pom.xml | 6 +- .../guacamole/net/DelegatingGuacamoleSocket.java | 84 +++++++++++++++++ .../org/apache/guacamole/net/GuacamoleSocket.java | 18 ++++ .../protocol/ConfiguredGuacamoleSocket.java | 29 ++---- .../protocol/FailoverGuacamoleSocket.java | 34 ++----- .../protocol/FilteredGuacamoleSocket.java | 22 +---- .../guacamole/protocol/GuacamoleConfiguration.java | 28 ++++-- .../guacamole/rest/tunnel/TunnelResource.java | 42 +++++++++ .../main/webapp/app/client/types/ManagedClient.js | 33 ++++--- .../main/webapp/app/rest/services/tunnelService.js | 30 +++++++ 12 files changed, 297 insertions(+), 165 deletions(-)