You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/07/21 09:14:10 UTC
[1/2] airavata git commit: fixing Airavata - 1784
Repository: airavata
Updated Branches:
refs/heads/airavata-0.15-release-branch d42f3f2db -> b8cb3d1a3
fixing Airavata - 1784
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/513fd8b9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/513fd8b9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/513fd8b9
Branch: refs/heads/airavata-0.15-release-branch
Commit: 513fd8b9e7991a751ec55eec56560ede1589f0da
Parents: 321f477
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jul 21 12:43:11 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jul 21 12:43:11 2015 +0530
----------------------------------------------------------------------
.../application/catalog/data/resources/AppInterfaceResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/513fd8b9/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
index d434ce6..f545569 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AppInterfaceResource.java
@@ -224,8 +224,8 @@ public class AppInterfaceResource extends AbstractResource {
em.close();
}
}
- Collections.sort(resourceList, (o1, o2) -> ((AppInterfaceResource) o1).getCreatedTime()
- .compareTo(((AppInterfaceResource) o2).getCreatedTime()));
+ Collections.sort(resourceList, (o1, o2) -> ((AppInterfaceResource) o1).getAppName()
+ .compareTo(((AppInterfaceResource) o2).getAppName()));
return resourceList;
}
[2/2] airavata git commit: Merge branch
'airavata-0.15-release-branch' of
https://git-wip-us.apache.org/repos/asf/airavata into
airavata-0.15-release-branch
Posted by sc...@apache.org.
Merge branch 'airavata-0.15-release-branch' of https://git-wip-us.apache.org/repos/asf/airavata into airavata-0.15-release-branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b8cb3d1a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b8cb3d1a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b8cb3d1a
Branch: refs/heads/airavata-0.15-release-branch
Commit: b8cb3d1a36a84e0d26bb388b8cbb866784426d84
Parents: 513fd8b d42f3f2
Author: Supun Nakandala <sc...@apache.org>
Authored: Tue Jul 21 12:43:26 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Tue Jul 21 12:43:26 2015 +0530
----------------------------------------------------------------------
.../airavata/gfac/core/cpi/BetterGfacImpl.java | 16 ++++------------
.../gfac/gsissh/provider/impl/GSISSHProvider.java | 10 ++++++++--
2 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------