You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/04/22 15:56:18 UTC
[airavata] 01/01: Merge remote-tracking branch
'origin/airavata-3281'
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6e51d46747b1fd63145065afebb0f9faa49f40f8
Merge: 8a6820d 0f7b264
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Apr 22 11:55:29 2020 -0400
Merge remote-tracking branch 'origin/airavata-3281'
.../airavata/helix/impl/task/AiravataTask.java | 26 +++++++++++++++++-----
.../src/main/assembly/controller-bin-assembly.xml | 1 +
.../main/assembly/email-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 1 +
.../src/main/assembly/participant-bin-assembly.xml | 1 +
.../assembly/platform-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/post-wm-bin-assembly.xml | 1 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 1 +
.../assembly/realtime-monitor-bin-assembly.xml | 1 +
9 files changed, 28 insertions(+), 6 deletions(-)