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 2019/11/15 19:54:55 UTC
[airavata] 02/02: Merge branch 'airavata-3268' 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 a67592603a4c23319d6ac861cbad5b31d86907db
Merge: adb4408 b07d1d0
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Fri Nov 15 14:54:09 2019 -0500
Merge branch 'airavata-3268' into develop
.../lib/airavata/model/application/io/ttypes.py | 16 ++-
.../resources/lib/airavata/model/group/ttypes.py | 3 +
.../resources/lib/airavata/model/sharing/ttypes.py | 15 ++-
.../model/application/io/InputDataObjectType.java | 115 ++++++++++++++++++++-
dev-tools/ansible/django.yml | 19 ++--
.../scigap/production/host_vars/delta/vars.yml | 55 ++++++++++
.../scigap/production/host_vars/delta/vault.yml | 15 +++
.../production/host_vars/distantreader/vars.yml | 1 +
.../ansible/inventories/scigap/production/hosts | 4 +
.../init/03-appcatalog-migrations.sql | 3 +
.../init/04-expcatalog-migrations.sql | 4 +
.../appcatalog/ApplicationInputEntity.java | 11 ++
.../entities/expcatalog/ExperimentInputEntity.java | 13 ++-
.../entities/expcatalog/ProcessInputEntity.java | 13 ++-
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 1 +
.../src/main/resources/expcatalog-derby.sql | 2 +
.../src/main/resources/expcatalog-mysql.sql | 2 +
.../expcatalog/ExperimentRepositoryTest.java | 4 +
.../DeltaScripts/appCatalog_schema_delta.sql | 3 +
.../experimentCatalog_schema_delta.sql | 4 +
.../application_io_models.thrift | 5 +-
22 files changed, 294 insertions(+), 15 deletions(-)