You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/11/05 19:29:55 UTC
[07/44] 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/a728bf21
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a728bf21
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a728bf21
Branch: refs/heads/gfac_appcatalog_int
Commit: a728bf2127dfacab50718b4188b7bcc0aa742a2d
Parents: 99e47f1 8b82bee
Author: lahiru <la...@apache.org>
Authored: Thu Oct 30 14:19:22 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Thu Oct 30 14:19:22 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 58 +
.../java/org/apache/airavata/api/Airavata.java | 25217 ++++++++++-------
.../main/resources/lib/airavata/Airavata.cpp | 4008 ++-
.../src/main/resources/lib/airavata/Airavata.h | 612 +
.../lib/airavata/Airavata_server.skeleton.cpp | 20 +
.../resources/lib/Airavata/API/Airavata.php | 1120 +
.../airavataAPI.thrift | 19 +
.../appcatalog/cpi/ComputeResource.java | 7 +
.../catalog/data/impl/ComputeResourceImpl.java | 51 +-
9 files changed, 19622 insertions(+), 11490 deletions(-)
----------------------------------------------------------------------