You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/05 02:47:35 UTC

[3/3] 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/2e04f68d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2e04f68d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2e04f68d

Branch: refs/heads/master
Commit: 2e04f68d079311b685365f60d532ad84941fb105
Parents: 8288ee0 429505a
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Fri Jul 4 20:47:20 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Fri Jul 4 20:47:20 2014 -0400

----------------------------------------------------------------------
 .../lib/computeResourceModel_types.cpp          | 518 +++++++-----
 .../resources/lib/computeResourceModel_types.h  | 193 +++--
 .../Model/AppCatalog/ComputeResource/Types.php  | 523 ++++++++-----
 .../ComputeResourceDescription.java             | 483 +++++-------
 .../computeresource/GlobusJobSubmission.java    | 150 +---
 .../computeresource/GridFTPDataMovement.java    |  32 +-
 .../computeresource/JobManagerCommand.java      | 101 +++
 .../computeresource/JobSubmissionProtocol.java  |   9 +-
 .../computeresource/LOCALSubmission.java        | 144 +---
 .../computeresource/ResourceJobManager.java     | 781 ++++++++++++++++++-
 .../computeresource/ResourceJobManagerType.java |  83 ++
 .../computeresource/SSHJobSubmission.java       | 142 +---
 .../computeResourceModel.thrift                 |  86 +-
 13 files changed, 1996 insertions(+), 1249 deletions(-)
----------------------------------------------------------------------