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 <[email protected]> Authored: Tue Jun 2 16:57:03 2015 -0400 Committer: Chathuri Wimalasena <[email protected]> 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(-) ----------------------------------------------------------------------
