This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-1408
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 3f7bd197d1eb242d6414e52d124e8207168ae3ae
Merge: 2035ec488 75a141cc9
Author: leonidfrolov <[email protected]>
AuthorDate: Mon Sep 5 10:08:02 2022 +0300

    Merge branch 'develop' into DATALAB-1408

 .../general/scripts/aws/common_prepare_notebook.py | 15 +++++----
 .../scripts/aws/common_terminate_notebook_image.py |  3 ++
 .../scripts/azure/common_prepare_notebook.py       |  3 ++
 .../azure/common_terminate_notebook_image.py       |  3 ++
 .../scripts/gcp/common_terminate_notebook_image.py |  3 ++
 .../src/ssn/files/azure/mongo_roles.json           | 10 ++++++
 .../backendapi/resources/ImageResource.java        |  1 -
 services/self-service/self-service.yml             |  2 +-
 .../backendapi/dao/ImageExploratoryDAO.java        |  2 +-
 .../backendapi/dao/ImageExploratoryDAOImpl.java    |  5 ++-
 .../resources/callback/ImageCallback.java          |  2 +-
 .../service/ImageExploratoryService.java           |  3 +-
 .../service/impl/ImageExploratoryServiceImpl.java  |  4 +--
 .../main/resources/mongo/azure/mongo_roles.json    | 12 +++++++
 ...utational-resource-create-dialog.component.html |  5 ++-
 ...mputational-resource-create-dialog.component.ts |  1 +
 .../computational-resource-create.model.ts         | 38 ++++++++++++++++++----
 17 files changed, 88 insertions(+), 24 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to