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

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

commit 3d407e0f76406183c6efd2894b0296361d056763
Merge: ed5cb85 b801135
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Wed Mar 25 17:47:49 2020 -0400

    Merge branch 'develop' into mft-integration

 .../appcatalog/groupresourceprofile/ttypes.py      | 217 +++++-
 .../airavata_python_sdk.egg-info/SOURCES.txt       |   3 +
 .../build/lib/clients/file_handling_client.py      |   1 +
 .../build/lib/clients/utils/__init__.py            |  16 +
 .../lib/clients/utils/api_server_client_util.py    |  74 ++
 .../lib/samples/create_launch_echo_experiment.py   |  37 +-
 .../build/lib/samples/file_utils.py                |  46 ++
 .../build/lib/transport/settings.ini               |   2 +-
 .../clients/file_handling_client.py                |   1 -
 .../airavata-python-sdk/clients/utils/__init__.py  |  16 +
 .../clients/utils/api_server_client_util.py        |  74 ++
 .../airavata_python_sdk-1.0.0-py2.py3-none-any.whl | Bin 327991 -> 330588 bytes
 .../samples/create_launch_echo_experiment.py       |  34 +-
 .../ComputeResourcePolicy.java                     |  32 +-
 .../ComputeResourceReservation.java                | 820 +++++++++++++++++++++
 .../GroupComputeResourcePreference.java            | 189 ++++-
 .../groupresourceprofile/GroupResourceProfile.java | 108 +--
 airavata-api/airavata-model-utils/pom.xml          |   6 +
 .../util/GroupComputeResourcePreferenceUtil.java   |  44 ++
 .../GroupComputeResourcePreferenceUtilTest.java    | 116 +++
 .../scigap/develop/host_vars/simccs/vars.yml       |   2 +-
 .../scigap/production/host_vars/csbglsu/vars.yml   |   2 +
 .../scigap/production/host_vars/dreg/vars.yml      |   2 +
 .../scigap/production/host_vars/iugateway/vars.yml |   1 +
 .../scigap/production/host_vars/nexttdb/vars.yml   |   1 +
 .../scigap/production/host_vars/seagrid/vars.yml   |   1 +
 .../scigap/production/host_vars/simccs/vars.yml    |   1 +
 .../production/host_vars/simvascular/vars.yml      |   1 +
 .../production/host_vars/southdakota/vars.yml      |   1 +
 .../scigap/production/host_vars/testdrive/vars.yml |   1 +
 dev-tools/ansible/roles/django/defaults/main.yml   |   4 +
 .../roles/django/templates/settings_local.py.j2    |   4 +
 dev-tools/ansible/roles/httpd/defaults/main.yml    |  16 +-
 dev-tools/ansible/roles/httpd/tasks/main.yml       |  23 +
 .../ansible/roles/httpd/templates/default.conf.j2  |   8 +-
 .../airavata/helix/impl/task/TaskContext.java      |   9 +
 .../org/apache/airavata/common/utils/JPAUtils.java |  13 +
 .../src/main/resources/META-INF/persistence.xml    |   1 +
 .../init/03-appcatalog-migrations.sql              |   9 +
 modules/registry/registry-core/README.md           |  13 +
 ....java => ComputeResourceReservationEntity.java} |  93 ++-
 .../appcatalog/GroupComputeResourcePrefEntity.java |  15 +-
 .../GroupSSHAccountProvisionerConfig.java          |   2 +-
 .../core/repositories/AbstractRepository.java      |  10 +-
 .../appcatalog/GroupResourceProfileRepository.java |  29 +-
 .../core/utils/JPAUtil/AppCatalogJPAUtils.java     |  40 +-
 .../src/main/resources/META-INF/persistence.xml    |   1 +
 .../src/main/resources/appcatalog-derby.sql        |   6 +
 .../src/main/resources/appcatalog-mysql.sql        |   8 +
 .../GroupResourceProfileRepositoryTest.java        | 257 ++++++-
 .../next/DeltaScripts/appCatalog_schema_delta.sql  |   9 +
 .../group_resource_profile_model.thrift            |  13 +-
 52 files changed, 2226 insertions(+), 206 deletions(-)


Reply via email to