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 2022/01/26 21:30:07 UTC
[airavata] branch develop updated (b393b53 -> dd4a902)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from b393b53 Merge branch 'AIRAVATA-3549' into develop
add a656a3f Merge pull request #275 from apache/log4j-upgrade
add ea8e538 Minor logging enhancement
add acce953 Optimizing the un-archiving process by separating out chain comands
add 936c21e Ignoring sym links empty directories when building the archive
add 44ad207 Updating the slurm script to override parmaters with pre job commands
add e351f81 Prioritizing external parameters when constructing the slurm script
add 0271293 Updated the redirect URI for the geo gateway
add 521b75a AIRAVATA-3319 Ansible: add more external IDP userinfo configs
add de3fa66 Merge branch 'airavata-3319'
add 027694a Merge branch 'AIRAVATA-3550'
new 07950cc AIRAVATA-3570 Ansible: include web component build dir
new dd4a902 Merge branch 'AIRAVATA-3570' into develop
The 2 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:
.../scigap/production/host_vars/geo/vars.yml | 2 +-
.../host_vars/microbial-genomes/vars.yml | 2 ++
.../scigap/production/host_vars/phasta/vars.yml | 2 ++
.../scigap/production/host_vars/saverx/vars.yml | 2 ++
.../production/host_vars/simvascular/vars.yml | 2 ++
.../scigap/production/host_vars/testdrive/vars.yml | 2 ++
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../helix/impl/task/staging/ArchiveTask.java | 26 +++++++++++++------
.../src/main/resources/SLURM_Groovy.template | 30 +++++++++++++++++++---
9 files changed, 56 insertions(+), 13 deletions(-)
[airavata] 02/02: Merge branch 'AIRAVATA-3570' into develop
Posted by ma...@apache.org.
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 dd4a90293f584e25e30467931b770ebc6af04668
Merge: b393b53 07950cc
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jan 26 16:29:44 2022 -0500
Merge branch 'AIRAVATA-3570' into develop
.../scigap/production/host_vars/geo/vars.yml | 2 +-
.../host_vars/microbial-genomes/vars.yml | 2 ++
.../scigap/production/host_vars/phasta/vars.yml | 2 ++
.../scigap/production/host_vars/saverx/vars.yml | 2 ++
.../production/host_vars/simvascular/vars.yml | 2 ++
.../scigap/production/host_vars/testdrive/vars.yml | 2 ++
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
.../helix/impl/task/staging/ArchiveTask.java | 26 +++++++++++++------
.../src/main/resources/SLURM_Groovy.template | 30 +++++++++++++++++++---
9 files changed, 56 insertions(+), 13 deletions(-)
[airavata] 01/02: AIRAVATA-3570 Ansible: include web component build dir
Posted by ma...@apache.org.
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 07950cc01a17772d57f4ddd2f95ef56c75b9fa2b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jan 26 16:29:36 2022 -0500
AIRAVATA-3570 Ansible: include web component build dir
---
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index abe65d6..0924aff 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -75,6 +75,7 @@ django_portal_js_build_dirs:
- "django_airavata/apps/groups/static/django_airavata_groups/dist"
- "django_airavata/apps/auth/static/django_airavata_auth/dist"
- "django_airavata/apps/workspace/static/django_airavata_workspace/dist"
+ - "django_airavata/apps/workspace/static/django_airavata_workspace/wc"
- "django_airavata/apps/dataparsers/static/django_airavata_dataparsers/dist"
## Keycloak related variables