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/09/09 21:54:28 UTC

[airavata] 04/04: Merge branch 'airavata-3369' 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 a7614b1bad2ecdc2c7735b59a658a409e3f35530
Merge: ceaac72 106e010
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Sep 9 17:54:00 2020 -0400

    Merge branch 'airavata-3369' into develop

 .../registry/core/entities/appcatalog/ApplicationInputEntity.java   | 1 +
 .../registry/core/entities/expcatalog/ExperimentInputEntity.java    | 1 +
 .../registry/core/entities/expcatalog/ProcessInputEntity.java       | 1 +
 .../registry/core/utils/migration/MigrationSchemaGenerator.java     | 2 +-
 .../registry/registry-core/src/main/resources/appcatalog-derby.sql  | 2 +-
 .../registry/registry-core/src/main/resources/appcatalog-mysql.sql  | 2 +-
 .../registry/registry-core/src/main/resources/expcatalog-derby.sql  | 6 +++---
 .../registry/registry-core/src/main/resources/expcatalog-mysql.sql  | 4 ++--
 .../0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql              | 3 +++
 .../0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql       | 6 +++++-
 10 files changed, 19 insertions(+), 9 deletions(-)