Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 372635a72 -> 8bb6e8921


GUACAMOLE-203: Add support for configuring the server-alive-interval SSH 
parameter.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5e9c2c66
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5e9c2c66
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5e9c2c66

Branch: refs/heads/master
Commit: 5e9c2c668960073926caf63d1518dbad0a6eda3f
Parents: 3beedd1
Author: Nick Couchman <[email protected]>
Authored: Wed May 31 08:27:07 2017 -0400
Committer: Nick Couchman <[email protected]>
Committed: Wed May 31 08:27:07 2017 -0400

----------------------------------------------------------------------
 .../src/main/resources/org/apache/guacamole/protocols/ssh.json | 6 +++++-
 guacamole/src/main/webapp/translations/en.json                 | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5e9c2c66/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
----------------------------------------------------------------------
diff --git 
a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json 
b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
index 93cef92..b3e81b7 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -69,6 +69,10 @@
                 {
                     "name"  : "command",
                     "type"  : "TEXT"
+                },
+                {
+                    "name"  : "server-alive-interval",
+                    "type"  : "NUMERIC"
                 }
             ]
         },
@@ -137,4 +141,4 @@
         }
 
     ]
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5e9c2c66/guacamole/src/main/webapp/translations/en.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/en.json 
b/guacamole/src/main/webapp/translations/en.json
index 4995f54..2ce6932 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -425,6 +425,7 @@
         "FIELD_HEADER_READ_ONLY"   : "Read-only:",
         "FIELD_HEADER_RECORDING_NAME" : "Recording name:",
         "FIELD_HEADER_RECORDING_PATH" : "Recording path:",
+        "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server Keepalive Interval:",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",
 

Reply via email to