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/06/30 17:24:24 UTC
[airavata] branch staging updated (3ba4e62 -> de0f823)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 3ba4e62 FIx fetching all existing GroupResourceProfiles
add 1a3b192 added manage_sharing permission type
add 20d32a3 corrected the revoking admins group sharing access
add 82bbd1a added MANAGE_SHARING permission type for default gateway in sql dump
add bf14d82 Corrected the condition for revoking sharing access
add 846e292 Merge branch 'AIRAVATA-2936' of https://github.com/aarushiibisht/airavata into AIRAVATA-2936
add 95df577 getAllAccessibleUsersInternal should also return all users which have OWNER right when permission type is MANAGE_SHARING
add 82deb9f Merge pull request #228 from aarushiibisht/AIRAVATA-2936
add 459c57d AIRAVATA-2588 Create mariadb database for django portals
add 011392c AIRAVATA-2588 Will need to install mysql-devel as a dependency of the python mysqlclient package
add 21fd56d AIRAVATA-2588 Gather facts on database for internal ip
add 184ff08 AIRAVATA-2588 Dev stack needs public network access to mysql
new de0f823 Merge remote-tracking branch 'origin/develop' into staging
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/server/handler/AiravataServerHandler.java | 71 +++++++++++++++++++---
.../model/group/ResourcePermissionType.java | 7 ++-
dev-tools/ansible/database.yml | 1 +
dev-tools/ansible/django.yml | 3 +
.../scigap/develop/group_vars/all/vars.yml | 7 +++
.../scigap/develop/group_vars/django/vars.yml | 1 +
dev-tools/ansible/inventories/scigap/develop/hosts | 20 +++---
dev-tools/ansible/roles/database/tasks/django.yml | 46 ++++++++++++++
dev-tools/ansible/roles/database/tasks/main.yml | 3 +
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../roles/django/templates/settings_local.py.j2 | 13 ++++
.../ansible/roles/django_setup/tasks/main.yml | 3 +-
.../database_scripts/init/01-databases.sql | 2 +-
.../migrator/airavata/AiravataDataMigrator.java | 8 +++
.../group_manager_model.thrift | 1 +
15 files changed, 165 insertions(+), 22 deletions(-)
create mode 100644 dev-tools/ansible/roles/database/tasks/django.yml
[airavata] 01/01: Merge remote-tracking branch 'origin/develop'
into staging
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit de0f823107ea1fff98300c8b11b7962ffae713ca
Merge: 3ba4e62 184ff08
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Sun Jun 30 13:23:54 2019 -0400
Merge remote-tracking branch 'origin/develop' into staging
.../api/server/handler/AiravataServerHandler.java | 71 +++++++++++++++++++---
.../model/group/ResourcePermissionType.java | 7 ++-
dev-tools/ansible/database.yml | 1 +
dev-tools/ansible/django.yml | 3 +
.../scigap/develop/group_vars/all/vars.yml | 7 +++
.../scigap/develop/group_vars/django/vars.yml | 1 +
dev-tools/ansible/inventories/scigap/develop/hosts | 20 +++---
dev-tools/ansible/roles/database/tasks/django.yml | 46 ++++++++++++++
dev-tools/ansible/roles/database/tasks/main.yml | 3 +
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../roles/django/templates/settings_local.py.j2 | 13 ++++
.../ansible/roles/django_setup/tasks/main.yml | 3 +-
.../database_scripts/init/01-databases.sql | 2 +-
.../migrator/airavata/AiravataDataMigrator.java | 8 +++
.../group_manager_model.thrift | 1 +
15 files changed, 165 insertions(+), 22 deletions(-)