You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/01/28 09:50:45 UTC

[incubator-datalab] 01/11: Merge branch 'DATALAB-2232' of github.com:apache/incubator-dlab into DATALAB-2233

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

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

commit be49dc73c9388168bb8511ff9c2409e55a535c11
Merge: 7030b9c 0b3b2b7
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Jan 25 10:14:44 2021 +0200

    Merge branch 'DATALAB-2232' of github.com:apache/incubator-dlab into DATALAB-2233

 .../src/general/conf/datalab.ini                   |  2 +-
 .../files/gcp/dataengine-service_description.json  |  8 ++-
 .../src/general/lib/os/debian/notebook_lib.py      |  4 +-
 .../dto/imagemetadata/ComputationalGPU.java        | 25 ++++++++
 .../imagemetadata/ComputationalMetadataDTO.java    |  5 ++
 .../datalab/backendapi/core/DockerWarmuper.java    | 39 ++++++------
 .../handlers/ExploratoryCallbackHandler.java       |  1 +
 .../handlers/dao/FileSystemCallbackHandlerDao.java |  2 +
 .../backendapi/resources/EnvironmentResource.java  |  2 +-
 .../backendapi/resources/ExploratoryResource.java  |  2 +-
 .../resources/InfrastructureTemplateResource.java  |  2 +-
 .../impl/InfrastructureTemplateServiceImpl.java    |  1 +
 .../administration/project/project.component.ts    | 27 +++++----
 .../src/app/core/util/{index.ts => helpUtils.ts}   | 27 ++++++---
 .../resources/webapp/src/app/core/util/index.ts    |  1 +
 .../bucket-browser/bucket-browser.component.ts     | 69 +++++++++++-----------
 .../detail-dialog/detail-dialog.component.ts       |  5 +-
 .../src/app/resources/resources.component.ts       |  1 -
 18 files changed, 140 insertions(+), 83 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org