Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/38738a2d Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/38738a2d Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/38738a2d Branch: refs/heads/master Commit: 38738a2d136c8c1c481db0b4d93ea4db28741c11 Parents: effe85e fd9369e Author: scnakandala <[email protected]> Authored: Fri Mar 11 15:28:18 2016 -0500 Committer: scnakandala <[email protected]> Committed: Fri Mar 11 15:28:18 2016 -0500 ---------------------------------------------------------------------- app/libraries/Airavata/API/Airavata.php | 387 +++++++++++++++++++ .../Model/AppCatalog/GatewayProfile/Types.php | 23 ++ 2 files changed, 410 insertions(+) ----------------------------------------------------------------------
