You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/03/12 17:33:57 UTC
[1/2] git commit: dont remove process files
Repository: airavata
Updated Branches:
refs/heads/master 922686bfd -> cb6b7a831
dont remove process files
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/86d2b622
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/86d2b622
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/86d2b622
Branch: refs/heads/master
Commit: 86d2b622d662ac331bec376d4caca8c91fb9f2b3
Parents: 13c67c4
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Mar 12 12:33:00 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Mar 12 12:33:00 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/server/ServerMain.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/86d2b622/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 8a99013..28a2802 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -132,7 +132,7 @@ public class ServerMain {
private static void performServerStopRequest(
CommandLineParameters commandLineParameters) throws IOException {
- deleteOldStartRecords();
+// deleteOldStartRecords();
String serverIndexOption = "serverIndex";
if (commandLineParameters.getParameters().containsKey(serverIndexOption)){
serverPID=Integer.parseInt(commandLineParameters.getParameters().get(serverIndexOption));
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cb6b7a83
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cb6b7a83
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cb6b7a83
Branch: refs/heads/master
Commit: cb6b7a831ad3d23f5b6fda290911df96d40e616f
Parents: 86d2b62 922686b
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Wed Mar 12 12:33:29 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Wed Mar 12 12:33:29 2014 -0400
----------------------------------------------------------------------
.../src/main/resources/registry-derby.sql | 2 +-
.../src/main/resources/registry-mysql.sql | 2 +-
.../airavata/gfac/provider/impl/GSISSHProvider.java | 2 +-
.../airavata/integration/WorkflowIntegrationTestBase.java | 6 +++---
.../src/test/resources/airavata-server.properties | 10 ++++------
.../src/test/resources/registry-derby.sql | 2 +-
.../registry/jpa/model/DataTransferDetail.java | 7 ++++---
.../jpa/resources/DataTransferDetailResource.java | 10 +++++++---
.../persistance/registry/jpa/resources/Utils.java | 5 ++++-
.../src/main/resources/registry-derby.sql | 2 +-
.../src/main/resources/registry-mysql.sql | 2 +-
.../src/test/resources/registry-derby.sql | 2 +-
12 files changed, 29 insertions(+), 23 deletions(-)
----------------------------------------------------------------------