airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [5/6] airavata-php-gateway git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into grouper-integration
Date Thu, 14 Jul 2016 07:08:02 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into
grouper-integration

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.


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/1c2e8fc4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/1c2e8fc4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/1c2e8fc4

Branch: refs/heads/grouper-integration
Commit: 1c2e8fc4346329e00d793095918b3a277c926a28
Parents: e6a7336 415edc5
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Thu Jul 14 03:03:36 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Thu Jul 14 03:03:36 2016 -0400

----------------------------------------------------------------------
 app/controllers/AccountController.php   |  4 +++-
 app/libraries/Airavata/API/Airavata.php | 31 ++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/1c2e8fc4/app/libraries/Airavata/API/Airavata.php
----------------------------------------------------------------------


Mime
View raw message