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 498CC184D4 for ; Mon, 4 Jan 2016 19:42:46 +0000 (UTC) Received: (qmail 27069 invoked by uid 500); 4 Jan 2016 19:42:46 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 26958 invoked by uid 500); 4 Jan 2016 19:42:46 -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 26931 invoked by uid 99); 4 Jan 2016 19:42:44 -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, 04 Jan 2016 19:42:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F740E05D0; Mon, 4 Jan 2016 19:42:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Mon, 04 Jan 2016 19:42:45 -0000 Message-Id: <5bef0482b98f434ba1e0a92d293d1652@git.apache.org> In-Reply-To: References: 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 into develop Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata into develop Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/312d7a22 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/312d7a22 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/312d7a22 Branch: refs/heads/develop Commit: 312d7a22025f3b9e850218040eeaa5edca5a85cf Parents: a7ff42e 7523c1e Author: scnakandala Authored: Mon Jan 4 14:42:21 2016 -0500 Committer: scnakandala Committed: Mon Jan 4 14:42:21 2016 -0500 ---------------------------------------------------------------------- .../gfac/core/cluster/JobSubmissionOutput.java | 2 +- .../impl/task/DefaultJobSubmissionTask.java | 52 ++++++++++++++------ 2 files changed, 39 insertions(+), 15 deletions(-) ----------------------------------------------------------------------