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 2020/06/19 20:36:13 UTC

[airavata-django-portal] 02/02: Merge branch 'AIRAVATA-3344-add-total-physical-memory-to-queue-settings' into develop

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 aec5cdfab5d185be4af3c66c8722f91079e0ddea
Merge: ac7f6e5 6b8f660
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jun 19 16:35:45 2020 -0400

    Merge branch 'AIRAVATA-3344-add-total-physical-memory-to-queue-settings' into develop

 .../models/ComputationalResourceSchedulingModel.js |  5 +++
 .../components/experiment/QueueSettingsEditor.vue  | 36 ++++++++++++++++++++--
 2 files changed, 39 insertions(+), 2 deletions(-)