You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2015/04/23 15:32:45 UTC
airavata git commit: fixing the build
Repository: airavata
Updated Branches:
refs/heads/master ab070e179 -> 5b192c906
fixing the build
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5b192c90
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5b192c90
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5b192c90
Branch: refs/heads/master
Commit: 5b192c906c0394e84b63c8a5955c863c72af130b
Parents: ab070e1
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Thu Apr 23 09:32:40 2015 -0400
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Thu Apr 23 09:32:40 2015 -0400
----------------------------------------------------------------------
.../org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5b192c90/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
index b0896d7..0df72f8 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/provider/impl/SSHProvider.java
@@ -50,15 +50,11 @@ import org.apache.airavata.gsi.ssh.impl.StandardOutReader;
import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths;
import org.apache.airavata.model.appcatalog.appinterface.DataType;
import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
-<<<<<<< HEAD
-import org.apache.airavata.model.appcatalog.computeresource.*;
-=======
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
import org.apache.airavata.model.appcatalog.computeresource.MonitorMode;
import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType;
import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
->>>>>>> bbb43ffb4ae8fef5041cb8fe9076b4244482c499
import org.apache.airavata.model.workspace.experiment.CorrectiveAction;
import org.apache.airavata.model.workspace.experiment.ErrorCategory;
import org.apache.airavata.model.workspace.experiment.JobDetails;