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/05/19 21:20:29 UTC

[airavata-django-portal] 02/02: Merge branch 'airavata-3323' 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 a25439e4eb16845ca21e85d9a19d29a0bfa49af7
Merge: 133b78c 4fa9290
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue May 19 17:18:52 2020 -0400

    Merge branch 'airavata-3323' into develop

 .../ComputePreference.vue                          | 28 +++++++++++-------
 .../ComputeResourceReservationList.vue             |  9 ++----
 .../GroupComputeResourcePreference.vue             | 26 ++++++++---------
 .../applications/ApplicationDeploymentsList.vue    |  4 +--
 .../applications/ApplicationEditorContainer.vue    |  2 +-
 .../ComputeResourcePreferenceDashboard.vue         | 34 ++++++++++++++++------
 .../gatewayprofile/StoragePreferenceList.vue       |  2 +-
 .../src/components/users/DeleteUserPanel.vue       |  2 +-
 .../experiment/input-editors/FileInputEditor.vue   |  2 +-
 .../components/storage/UserStoragePathViewer.vue   |  2 +-
 10 files changed, 65 insertions(+), 46 deletions(-)