Merge branch 'grouper-integration' of https://github.com/jeffkinnison/airavata-php-gateway into develop
# 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/21748deb Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/21748deb Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/21748deb Branch: refs/heads/develop Commit: 21748deb1742b0f5e05ae4f083570504cf33f818 Parents: f5ff011 9ff7296 Author: scnakandala <[email protected]> Authored: Thu Aug 18 10:16:58 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Aug 18 10:16:58 2016 -0400 ---------------------------------------------------------------------- app/controllers/ExperimentController.php | 3 ++- app/libraries/ExperimentUtilities.php | 6 +++--- app/views/experiment/create-complete.blade.php | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/21748deb/app/libraries/ExperimentUtilities.php ----------------------------------------------------------------------
