[airavata] branch develop updated (da0973b -> 9ef216d)

[ma...@apache.org]

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 da0973b  Changed the directory name to distantr
     add abbb9ee  update client secret of searchsra
     add 89ddf10  Add Django/tusd staging config
     add cf29ed2  Ansible: build django JS code locally in Docker
     add 502acac  Create temp directory for local django portal clone/build
     add 95664d2  Rename docker image/container
     add 6401c81  Add docker is running check
     add ea710c2  Revert "AIRAVATA-2984 Set STATIC_ROOT env var when building js"
     add 0cbc833  Fixes for doing local Docker based build of Django code
     add b0e15a5  Reuse npm cache between builds
     new 9ef216d  Merge remote-tracking branch 'origin/staging' 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:
 dev-tools/ansible/django.yml                       |  2 -
 .../scigap/staging/group_vars/django/vars.yml      |  1 +
 .../scigap/staging/host_vars/searchsra/vault.yml   | 28 +++----
 dev-tools/ansible/requirements.txt                 |  1 +
 dev-tools/ansible/roles/django/defaults/main.yml   |  1 -
 dev-tools/ansible/roles/django/tasks/main.yml      | 96 ++++++++++++++++++----
 .../roles/django/templates/settings_local.py.j2    |  2 +-
 7 files changed, 95 insertions(+), 36 deletions(-)

[airavata] 01/01: Merge remote-tracking branch 'origin/staging' into develop

[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 9ef216d77437e69780d5678ff561f9801ac58ae0
Merge: da0973b b0e15a5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 16 15:44:50 2019 -0400

    Merge remote-tracking branch 'origin/staging' into develop

 dev-tools/ansible/django.yml                       |  2 -
 .../scigap/staging/group_vars/django/vars.yml      |  1 +
 .../scigap/staging/host_vars/searchsra/vault.yml   | 28 +++----
 dev-tools/ansible/requirements.txt                 |  1 +
 dev-tools/ansible/roles/django/defaults/main.yml   |  1 -
 dev-tools/ansible/roles/django/tasks/main.yml      | 96 ++++++++++++++++++----
 .../roles/django/templates/settings_local.py.j2    |  2 +-
 7 files changed, 95 insertions(+), 36 deletions(-)