airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: fixnig a merge
Date Fri, 07 Mar 2014 15:53:13 GMT
Repository: airavata
Updated Branches:
  refs/heads/master dda627b26 -> 83dd7b0c4


fixnig a merge


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/83dd7b0c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/83dd7b0c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/83dd7b0c

Branch: refs/heads/master
Commit: 83dd7b0c42f5526ba4d90b49957f496b9c27cbea
Parents: dda627b
Author: lahiru <lahiru@apache.org>
Authored: Fri Mar 7 10:53:07 2014 -0500
Committer: lahiru <lahiru@apache.org>
Committed: Fri Mar 7 10:53:07 2014 -0500

----------------------------------------------------------------------
 .../apache/airavata/client/samples/CreateLaunchExperiment.java    | 2 +-
 .../java/org/apache/airavata/client/tools/DocumentCreator.java    | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/83dd7b0c/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 300e91b..62f0cfd 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -61,7 +61,7 @@ public class CreateLaunchExperiment {
             final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST,
THRIFT_SERVER_PORT);
             System.out.println("API version is " + airavata.GetAPIVersion());
             addDescriptors();
-            final String expId = createExperimentForTrestles(airavata);
+            final String expId = createExperimentForStampede(airavata);
             System.out.println("Experiment ID : " + expId);
             launchExperiment(airavata, expId);
             System.out.println("Launched successfully");

http://git-wip-us.apache.org/repos/asf/airavata/blob/83dd7b0c/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
----------------------------------------------------------------------
diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
index e49fe20..60c53d5 100644
--- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
+++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java
@@ -213,10 +213,7 @@ public class DocumentCreator {
         host.getType().setHostAddress(hpcHostAddress);
         host.getType().setHostName(gsiSshHostName);
         ((GsisshHostType) host.getType()).setPort(22);
-<<<<<<< HEAD
         ((GsisshHostType) host.getType()).setInstalledPath("/opt/torque/bin/");
-=======
->>>>>>> 219063e0df324509d24b68dfdd2bc65032219e1b
 
         try {
             airavataAPI.getApplicationManager().saveHostDescription(host);


Mime
View raw message