From commits-return-7064-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Thu Sep 18 09:46:17 2014 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 128DE11240 for ; Thu, 18 Sep 2014 09:46:17 +0000 (UTC) Received: (qmail 38025 invoked by uid 500); 18 Sep 2014 09:46:17 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 37916 invoked by uid 500); 18 Sep 2014 09:46:17 -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 37899 invoked by uid 99); 18 Sep 2014 09:46:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 09:46:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A419A1A98E; Thu, 18 Sep 2014 09:46:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: msmemon@apache.org To: commits@airavata.apache.org Date: Thu, 18 Sep 2014 09:46:17 -0000 Message-Id: <9305f890592449beabced6eba768c17d@git.apache.org> In-Reply-To: <74725b8cd00743acb247e588c2daf895@git.apache.org> References: <74725b8cd00743acb247e588c2daf895@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/7542f690 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7542f690 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7542f690 Branch: refs/heads/master Commit: 7542f69006fe819d65e0badb0cb897e196a2e0f0 Parents: c625126 9dac178 Author: msmemon Authored: Thu Sep 18 11:43:16 2014 +0200 Committer: msmemon Committed: Thu Sep 18 11:43:16 2014 +0200 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 14 +-- .../catalog/data/impl/ComputeResourceImpl.java | 2 +- .../airavata/gfac/server/GfacServerHandler.java | 3 + .../org/apache/airavata/gfac/Constants.java | 3 + .../airavata/gfac/core/monitor/MonitorID.java | 3 + .../gfac/gsissh/util/GFACGSISSHUtils.java | 3 +- .../airavata/gfac/monitor/HPCMonitorID.java | 28 +++++- .../monitor/impl/pull/qstat/HPCPullMonitor.java | 6 +- .../impl/push/amqp/SimpleJobFinishConsumer.java | 11 +- .../airavata/gfac/monitor/util/CommonUtils.java | 100 ++++++++++--------- .../ssh/handler/AdvancedSCPOutputHandler.java | 4 +- .../airavata/gfac/ssh/util/GFACSSHUtils.java | 4 +- .../server/OrchestratorServerHandler.java | 76 ++++++++------ .../core/context/OrchestratorContext.java | 6 +- .../apache/airavata/gsi/ssh/api/Cluster.java | 6 ++ 15 files changed, 169 insertions(+), 100 deletions(-) ----------------------------------------------------------------------