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 48C4C178CF for ; Fri, 24 Apr 2015 17:58:52 +0000 (UTC) Received: (qmail 53732 invoked by uid 500); 24 Apr 2015 17:58:52 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 53616 invoked by uid 500); 24 Apr 2015 17:58:52 -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 53602 invoked by uid 99); 24 Apr 2015 17:58:52 -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; Fri, 24 Apr 2015 17:58:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0FD65E0F7D; Fri, 24 Apr 2015 17:58:52 +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, 24 Apr 2015 17:58:53 -0000 Message-Id: <141d58ca22b544caa1b3d86c1ef84af6@git.apache.org> In-Reply-To: <878e6f2b044a4d75b3bb6c7e89f7231b@git.apache.org> References: <878e6f2b044a4d75b3bb6c7e89f7231b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] airavata git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a665aa56 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a665aa56 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a665aa56 Branch: refs/heads/master Commit: a665aa56a1b8843ee43eff12e6feb7bcdab10378 Parents: ccdf5c4 02aa95b Author: shamrath Authored: Fri Apr 24 13:58:40 2015 -0400 Committer: shamrath Committed: Fri Apr 24 13:58:40 2015 -0400 ---------------------------------------------------------------------- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 2 +- .../server/OrchestratorServerHandler.java | 51 +++---- .../ComputeResourceRegister.java | 5 +- .../ExperimentExecution.java | 144 ++++++++++--------- .../FrameworkBootstrapping.java | 4 +- .../TestFrameworkProps.java | 10 ++ .../src/main/resources/test-framework.json | 7 +- 7 files changed, 115 insertions(+), 108 deletions(-) ----------------------------------------------------------------------