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 7A10A17EF6 for ; Wed, 3 Jun 2015 00:57:13 +0000 (UTC) Received: (qmail 89485 invoked by uid 500); 2 Jun 2015 20:57:13 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 89436 invoked by uid 500); 2 Jun 2015 20:57:13 -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 89427 invoked by uid 99); 2 Jun 2015 20:57:13 -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; Tue, 02 Jun 2015 20:57:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1D91DFFD5; Tue, 2 Jun 2015 20:57:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chathuri@apache.org To: commits@airavata.apache.org Date: Tue, 02 Jun 2015 20:57:14 -0000 Message-Id: In-Reply-To: <7446b1f536a24a768441f3c21b9af8e5@git.apache.org> References: <7446b1f536a24a768441f3c21b9af8e5@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/7c95cf75 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c95cf75 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c95cf75 Branch: refs/heads/master Commit: 7c95cf757f3df3fa94767e25c8499d9f469d318c Parents: 7c7bdae 22a76f8 Author: Chathuri Wimalasena Authored: Tue Jun 2 16:57:03 2015 -0400 Committer: Chathuri Wimalasena Committed: Tue Jun 2 16:57:03 2015 -0400 ---------------------------------------------------------------------- .../main/resources/lib/airavata/Airavata.cpp | 61 +++++++++++++++++-- .../src/main/resources/lib/airavata/Airavata.h | 38 ++++++++---- .../lib/airavata/Airavata_server.skeleton.cpp | 2 +- .../resources/lib/airavata/airavataAPI_types.h | 1 + .../lib/airavata/airavataDataModel_types.h | 1 + .../resources/lib/Airavata/API/Airavata.php | 63 ++++++++++++++++++-- .../lib/apache/airavata/api/Airavata-remote | 8 +-- .../lib/apache/airavata/api/Airavata.py | 57 ++++++++++++++++-- .../resources/lib/apache/airavata/api/ttypes.py | 1 + .../lib/apache/airavata/model/ttypes.py | 1 + .../catalog/resources/WorkerResource.java | 14 ++--- 11 files changed, 208 insertions(+), 39 deletions(-) ----------------------------------------------------------------------