This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit 954f717a560dabf8eee0ffc11ad7a51b63ab39ae Merge: b658574 4c52d38 Author: Marcus Christie <[email protected]> AuthorDate: Thu Nov 9 16:14:26 2017 -0500 Merge branch 'Airavata-2279,2280' into develop app/controllers/AdminController.php | 22 +- app/libraries/AdminUtilities.php | 4 + app/views/admin/manage-credentials.blade.php | 370 ++++++++++++--------- .../compute-resource-preferences.blade.php | 4 +- .../partials/gateway-preferences-block.blade.php | 10 +- .../storage-resource-preferences.blade.php | 4 +- 6 files changed, 237 insertions(+), 177 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
