Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway 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/ba651fe2 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ba651fe2 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ba651fe2 Branch: refs/heads/develop Commit: ba651fe2b7ca9d09dd6a5b8fc90dfc276dc5c3a0 Parents: 20458c6 ac25081 Author: Nipurn Doshi <[email protected]> Authored: Fri Feb 26 15:07:03 2016 -0500 Committer: Nipurn Doshi <[email protected]> Committed: Fri Feb 26 15:07:03 2016 -0500 ---------------------------------------------------------------------- .../Model/AppCatalog/ComputeResource/Types.php | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
