Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3C106C7F2 for ; Fri, 14 Nov 2014 22:08:00 +0000 (UTC) Received: (qmail 38362 invoked by uid 500); 14 Nov 2014 22:08:00 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 38321 invoked by uid 500); 14 Nov 2014 22:08:00 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 38304 invoked by uid 99); 14 Nov 2014 22:08:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Nov 2014 22:08:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CE9DC98A3A4; Fri, 14 Nov 2014 22:07:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Fri, 14 Nov 2014 22:08:00 -0000 Message-Id: <4fbe4dd32ee646fca93a21f84306dd49@git.apache.org> In-Reply-To: <623132c95ee14cd4b80f69864dabd0fc@git.apache.org> References: <623132c95ee14cd4b80f69864dabd0fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f8475797 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f8475797 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f8475797 Branch: refs/heads/master Commit: f8475797a5b3295bfe6d82caf4a3dee09a4cc598 Parents: 778f3da 6d7890d Author: shamrath Authored: Fri Nov 14 17:07:49 2014 -0500 Committer: shamrath Committed: Fri Nov 14 17:07:49 2014 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 11 +++- .../data/impl/ApplicationInterfaceImpl.java | 63 +++++++++++++------- .../resources/AppModuleMappingResource.java | 29 ++++++++- .../resources/ApplicationInputResource.java | 6 +- .../resources/ApplicationOutputResource.java | 31 +++++----- .../app/catalog/test/AppInterfaceTest.java | 15 ++++- .../airavata/gfac/monitor/HPCMonitorID.java | 2 +- .../apache/airavata/gsi/ssh/util/SSHUtils.java | 4 +- 8 files changed, 112 insertions(+), 49 deletions(-) ----------------------------------------------------------------------