airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [14/14] airavata-php-gateway git commit: Merging master changes with develop. Master conflicts were over written by develop branch - since develop is tested.
Date Mon, 03 Apr 2017 17:20:15 GMT
Merging master changes with develop. Master conflicts were over written by develop branch -
since develop is tested.


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

Branch: refs/heads/develop
Commit: dc556d73de712406ecb98119dc2b15f4ab80b894
Parents: 0dca1aa 98a620d
Author: Suresh Marru <smarru@apache.org>
Authored: Mon Apr 3 13:19:54 2017 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Mon Apr 3 13:19:54 2017 -0400

----------------------------------------------------------------------
 app/controllers/GatewayController.php | 40 ------------------------------
 app/libraries/ProjectUtilities.php    |  1 -
 app/routes.php                        |  4 ---
 app/views/home.blade.php              |  2 +-
 4 files changed, 1 insertion(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dc556d73/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --cc app/libraries/ProjectUtilities.php
index a02ae69,1ac6502..b7f7dd9
mode 100755,100644..100755
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php

http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/dc556d73/app/routes.php
----------------------------------------------------------------------
diff --cc app/routes.php
index b2e58cd,cd0b20f..70bdc88
mode 100755,100644..100755
--- a/app/routes.php
+++ b/app/routes.php


Mime
View raw message