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 2021/10/14 19:09:38 UTC

[airavata-django-portal] branch develop updated (9fbecbf -> e4607ba)

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-django-portal.git.


    from 9fbecbf  AIRAVATA-3529 Revert docker python base image to 3.9
     add bac19ab  AIRAVATA-3531 Make sure to import custom code last so that settings take affect
     new e4607ba  Merge branch 'AIRAVATA-3531' into develop

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:
 django_airavata/settings.py | 72 ++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

[airavata-django-portal] 01/01: Merge branch 'AIRAVATA-3531' 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-django-portal.git

commit e4607baf571dcd69e44d101febd99633541b2f81
Merge: 9fbecbf bac19ab
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Oct 14 15:09:13 2021 -0400

    Merge branch 'AIRAVATA-3531' into develop

 django_airavata/settings.py | 72 ++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 34 deletions(-)