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 e149fd4f7041f7c1f1d89931aea85577fcbb5d84
Merge: a1c382c 7e9b970
Author: Michael Jumper
AuthorDate: Thu Jun 20
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 a1c382c Merge 1.1.0 changes back to master.
add b7dca0e GUACAMOLE-547: Add support for SSH NONE aut
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git.
from 8b53be4 GUACAMOLE-422: Merge changes to Guacamole protocol handshake
adding flexibility and timez
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch staging/1.1.0
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit 7e9b97007ec0100a1a8ca28cde9d872f31a7629f
Merge: 8b53be4 1baa91f
Author: Mike Jumper
AuthorDate: Thu Ju