You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2022/01/14 18:59:30 UTC
[airavata] branch develop updated (7a191a7 -> 3ed6a12)
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 7a191a7 Merge branch 'AIRAVATA-3549' into develop
add 139d5e4 Fixing the issue of standard out and error files are not getting registered
new 181a8c3 Merge branch 'AIRAVATA-3549' into develop
new 3ed6a12 Merge branch 'develop' of https://github.com/apache/airavata into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../airavata/helix/impl/task/TaskContext.java | 38 ++++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
[airavata] 02/02: Merge branch 'develop' of https://github.com/apache/airavata into develop
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 3ed6a1263befbc90b0ab8918c69eaa4825d71b50
Merge: 181a8c3 7a191a7
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Fri Jan 14 13:59:07 2022 -0500
Merge branch 'develop' of https://github.com/apache/airavata into develop
[airavata] 01/02: Merge branch 'AIRAVATA-3549' into develop
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 181a8c342d9c7ff4786e4033062a4e54c6c58b77
Merge: e4e97e3 139d5e4
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Fri Jan 14 13:56:29 2022 -0500
Merge branch 'AIRAVATA-3549' into develop
# Conflicts:
# modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
.../api/server/handler/AiravataServerHandler.java | 174 +-
.../java/org/apache/airavata/api/Airavata.java | 7307 ++++++++++++--------
.../airavata/helix/impl/task/TaskContext.java | 38 +-
.../server/OrchestratorServerHandler.java | 87 +-
.../airavata-apis/airavata_api.thrift | 20 +
5 files changed, 4787 insertions(+), 2839 deletions(-)