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 2017/02/22 19:17:59 UTC

[1/2] airavata git commit: change Cancel status in UGEEmailParser

Repository: airavata
Updated Branches:
  refs/heads/develop d4dad6dc8 -> 527e63527


change Cancel status in UGEEmailParser


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

Branch: refs/heads/develop
Commit: 2f3847b202006c67e857c0e6e58078498fb3acc8
Parents: a700073
Author: scnakandala <su...@gmail.com>
Authored: Wed Feb 22 14:17:22 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Feb 22 14:17:22 2017 -0500

----------------------------------------------------------------------
 .../apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java  | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/2f3847b2/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
index bf63d08..0eef055 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/monitor/email/parser/UGEEmailParser.java
@@ -87,8 +87,6 @@ public class UGEEmailParser implements EmailParser {
             case FAILED:
                 return JobState.FAILED;
             case ABORTED:
-                return JobState.FAILED;
-            case KILLED:
                 return JobState.CANCELED;
             default:
                 return JobState.UNKNOWN;

[2/2] airavata git commit: merge remote branch

Posted by sc...@apache.org.
merge remote branch


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

Branch: refs/heads/develop
Commit: 527e63527463b8839ba62e957ee48143d0da1d00
Parents: 2f3847b d4dad6d
Author: scnakandala <su...@gmail.com>
Authored: Wed Feb 22 14:17:51 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Wed Feb 22 14:17:51 2017 -0500

----------------------------------------------------------------------
 modules/configuration/server/src/main/resources/gfac-config.yaml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------