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 2021/06/23 15:53:57 UTC

[airavata] 01/01: Merge branch 'airavata-3322' into develop

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 06e4dad62c0eec2e2ca3afef7c3c386e89577d6e
Merge: ace6d9c e170341
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 23 11:53:29 2021 -0400

    Merge branch 'airavata-3322' into develop

 .../api/server/handler/AiravataServerHandler.java  |   4 +-
 .../java/org/apache/airavata/api/Airavata.java     | 240 ++++++++++++++++++--
 .../scigap/production/host_vars/immune/vars.yml    |   3 +
 .../scigap/production/host_vars/testdrive/vars.yml |   2 +-
 .../expcatalog/ExperimentSummaryRepository.java    | 132 +++++++----
 .../ExperimentSummaryRepositoryTest.java           |  28 ++-
 .../api/service/handler/RegistryServerHandler.java |   7 +-
 .../airavata/registry/api/RegistryService.java     | 241 +++++++++++++++++++--
 .../airavata-apis/airavata_api.thrift              |  10 +-
 .../component-cpis/registry-api.thrift             |  11 +-
 10 files changed, 600 insertions(+), 78 deletions(-)