You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/05 23:42:31 UTC
[4/6] airavata git commit: Merge branch 'master' into develop
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab6c1de6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab6c1de6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab6c1de6
Branch: refs/heads/develop
Commit: ab6c1de672fa9f20283d90cb5ed075393d9da462
Parents: 7850458 9bc25f9
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Aug 5 18:50:30 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Aug 5 18:50:30 2016 -0400
----------------------------------------------------------------------
.../gateway_resource_profile_model_types.cpp | 88 ++++
.../gateway_resource_profile_model_types.h | 36 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 92 ++++
.../model/appcatalog/gatewayprofile/ttypes.py | 54 ++-
.../ComputeResourcePreference.java | 418 ++++++++++++++++++-
.../apache/airavata/gfac/core/GFacUtils.java | 26 +-
.../airavata/gfac/core/JobDescriptor.java | 17 +-
.../gfac/core/x2012/x12/AfterAnyList.java | 2 +-
.../gfac/core/x2012/x12/AfterOKList.java | 2 +-
.../gfac/core/x2012/x12/ExportProperties.java | 4 +-
.../airavata/gfac/core/x2012/x12/InputList.java | 2 +-
.../core/x2012/x12/JobDescriptorDocument.java | 2 +-
.../gfac/core/x2012/x12/ModuleLoadCommands.java | 2 +-
.../airavata/gfac/core/x2012/x12/PbsParams.java | 62 ++-
.../gfac/core/x2012/x12/PostJobCommands.java | 2 +-
.../gfac/core/x2012/x12/PreJobCommands.java | 2 +-
.../gfac/core/x2012/x12/impl/PbsParamsImpl.java | 188 +++++++++
.../src/main/resources/PBSJobDescriptor.xsd | 2 +
.../src/main/resources/SLURMTemplate.xslt | 12 +-
.../gateway_resource_profile_model.thrift | 6 +-
20 files changed, 996 insertions(+), 23 deletions(-)
----------------------------------------------------------------------