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 2021/12/31 06:55:50 UTC

[airavata] branch develop updated (4c1cfb3 -> 9768729)

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 4c1cfb3  Minor bug fix of missing intermediate output filter in ExperimentConsumer
     add 88cb8a9  Fixing the bug in deserializing intermediate output event
     new 9768729  Merge branch 'AIRAVATA-3549' into develop

The 1 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:
 .../messaging/core/impl/ExperimentConsumer.java    | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

[airavata] 01/01: 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 9768729b6a45a9fbd65a3af563ad3e9a611a6496
Merge: 4c1cfb3 88cb8a9
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Fri Dec 31 01:54:58 2021 -0500

    Merge branch 'AIRAVATA-3549' into develop
    
    # Conflicts:
    #	modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/ExperimentConsumer.java

 .../messaging/core/impl/ExperimentConsumer.java    | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)