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/85cde27c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/85cde27c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/85cde27c Branch: refs/heads/master Commit: 85cde27cc71b7d77e6d377d263d3e7a69e327e08 Parents: 5331b94 78365f4 Author: Saminda Wijeratne <[email protected]> Authored: Mon Mar 10 12:28:42 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Mon Mar 10 12:28:42 2014 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 93 +- .../java/org/apache/airavata/api/Airavata.java | 13831 ++++++++++++----- .../airavataAPI.thrift | 122 +- 3 files changed, 10014 insertions(+), 4032 deletions(-) ----------------------------------------------------------------------
