Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1E38D200CBA for ; Tue, 4 Jul 2017 00:01:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1CCE5160C00; Mon, 3 Jul 2017 22:01:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62EAF160BEC for ; Tue, 4 Jul 2017 00:01:18 +0200 (CEST) Received: (qmail 57566 invoked by uid 500); 3 Jul 2017 22:01:17 -0000 Mailing-List: contact commits-help@guacamole.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@guacamole.incubator.apache.org Delivered-To: mailing list commits@guacamole.incubator.apache.org Received: (qmail 57557 invoked by uid 99); 3 Jul 2017 22:01:17 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2017 22:01:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 34E861AFB13 for ; Mon, 3 Jul 2017 22:01:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.222 X-Spam-Level: X-Spam-Status: No, score=-4.222 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 0SIikaBmbsYe for ; Mon, 3 Jul 2017 22:01:16 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 61FE95FCE8 for ; Mon, 3 Jul 2017 22:01:15 +0000 (UTC) Received: (qmail 57554 invoked by uid 99); 3 Jul 2017 22:01:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2017 22:01:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 16635E964C; Mon, 3 Jul 2017 22:01:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vnick@apache.org To: commits@guacamole.incubator.apache.org Date: Mon, 03 Jul 2017 22:01:15 -0000 Message-Id: In-Reply-To: <65705291e3084285a701607580c73ad6@git.apache.org> References: <65705291e3084285a701607580c73ad6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-guacamole-client git commit: GUACAMOLE-303: Merge Add definitation and translations for new sftp-root-directory parameter. archived-at: Mon, 03 Jul 2017 22:01:19 -0000 GUACAMOLE-303: Merge Add definitation and translations for new sftp-root-directory 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/33e76c4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/33e76c4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/33e76c4d Branch: refs/heads/master Commit: 33e76c4d72ef054960e2a90c3b22742974d53971 Parents: 5d13994 5fcd484 Author: Nick Couchman Authored: Mon Jul 3 17:59:11 2017 -0400 Committer: Nick Couchman Committed: Mon Jul 3 17:59:11 2017 -0400 ---------------------------------------------------------------------- .../src/main/resources/org/apache/guacamole/protocols/rdp.json | 4 ++++ .../src/main/resources/org/apache/guacamole/protocols/ssh.json | 4 ++++ .../src/main/resources/org/apache/guacamole/protocols/vnc.json | 4 ++++ guacamole/src/main/webapp/translations/en.json | 3 +++ 4 files changed, 15 insertions(+) ----------------------------------------------------------------------