airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dimuthu...@apache.org
Subject [airavata] 02/02: Merge branch 'master' of https://github.com/apache/airavata
Date Tue, 22 Oct 2019 18:30:16 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 9c1e3649382fb20dda6ed0ea5388181aafce26c4
Merge: bb15f3b 45672db
Author: Dimuthu Wannipurage <dimuthu.upeksha2@gmail.com>
AuthorDate: Tue Oct 22 14:30:01 2019 -0400

    Merge branch 'master' of https://github.com/apache/airavata
    
    # Conflicts:
    #	dev-tools/ansible/roles/helix_setup/templates/participant/airavata-server.properties.j2
    #	modules/distribution/src/main/assembly/participant-bin-assembly.xml

 .../model/group/ResourcePermissionType.java        |   2 +-
 dev-tools/ansible/django.yml                       |   2 -
 .../scigap/develop/host_vars/simccs/vars.yml       |   2 +
 .../production/pga_config/snowvision/vars.yml      |  65 ++++++
 .../production/pga_config/snowvision/vault.yml     |  18 ++
 .../scigap/staging/group_vars/django/vars.yml      |   1 +
 .../scigap/staging/host_vars/searchsra/vars.yml    |  14 +-
 .../scigap/staging/host_vars/searchsra/vault.yml   |  28 +--
 .../simccs/files/django-ssl-vhost.conf.j2          |  82 ++++++++
 .../{develop => staging}/host_vars/simccs/vars.yml |  43 ++--
 .../scigap/staging/host_vars/simccs/vault.yml      |  15 ++
 dev-tools/ansible/inventories/scigap/staging/hosts |   1 +
 dev-tools/ansible/pga-scigap-prod.yml              |   3 +-
 dev-tools/ansible/requirements.txt                 |   1 +
 dev-tools/ansible/roles/django/defaults/main.yml   |   2 +-
 dev-tools/ansible/roles/django/tasks/main.yml      | 103 ++++++++--
 .../roles/django/templates/settings_local.py.j2    |   9 +-
 .../participant/airavata-server.properties.j2      |   1 +
 dev-tools/ansible/roles/httpd/defaults/main.yml    |   2 -
 dev-tools/ansible/roles/httpd/tasks/main.yml       |   7 -
 .../src/main/assembly/participant-bin-assembly.xml |   4 +
 .../database_scripts/sharing-registry-mysql.sql    |   5 +-
 .../cpi/impl/SimpleOrchestratorImpl.java           |   3 +
 .../appcatalog/ResourceJobManagerEntity.java       |   3 +-
 .../appcatalog/SshJobSubmissionEntity.java         |   3 +-
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |   4 +
 .../sharing/registry/db/entities/DomainEntity.java |  13 +-
 .../server/SharingRegistryServerHandler.java       |   6 +
 .../src/main/resources/sharing-registry-derby.sql  |   3 +
 .../src/main/resources/sharing-registry-mysql.sql  |   5 +-
 .../registry/SharingRegistryServerHandlerTest.java |  35 ++++
 .../airavata/sharing/registry/models/Domain.java   | 141 +++++++++++--
 .../registry/models/DuplicateEntryException.java   |  12 +-
 .../airavata/sharing/registry/models/Entity.java   |  70 +++----
 .../sharing/registry/models/EntityType.java        |  32 ++-
 .../sharing/registry/models/GroupAdmin.java        |  17 +-
 .../sharing/registry/models/GroupMembership.java   |  36 ++--
 .../sharing/registry/models/PermissionType.java    |  32 ++-
 .../sharing/registry/models/SearchCriteria.java    |  25 +--
 .../airavata/sharing/registry/models/Sharing.java  |  46 ++---
 .../registry/models/SharingRegistryException.java  |  12 +-
 .../airavata/sharing/registry/models/User.java     |  50 ++---
 .../sharing/registry/models/UserGroup.java         |  60 ++----
 .../sharing-service-docs/api-docs/sharing_cpi.html | 224 ++++++++++-----------
 .../api-docs/sharing_models.html                   |  70 +++----
 .../sharing-models/sharing_models.thrift           |   6 +-
 46 files changed, 809 insertions(+), 509 deletions(-)



Mime
View raw message