Merge 1.1.0 changes back to master.

This commit is contained in:
Virtually Nick committed 2019-08-03 17:06:42 -04:00
commit 02ef3ae2d8
4 files changed
+243 -2

No files matched your search

@@ -53,7 +53,7 @@ public class LocalEnvironment implements Environment {
* Array of all known protocol names.
*/
private static final String[] KNOWN_PROTOCOLS = new String[]{
"vnc", "rdp", "ssh", "telnet"};
"vnc", "rdp", "ssh", "telnet", "kubernetes"};
/**
* The hostname to use when connecting to guacd if no hostname is provided