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 15:46:40 UTC
[incubator-datalab] 01/01: Merge branch 'DATALAB-2232' of
github.com:apache/incubator-dlab into DATALAB-2258
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2258
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a34480f21726d7476a4e37b8b9c1f86b1a8591e3
Merge: 2d03289 e862bae
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Jan 28 17:46:06 2021 +0200
Merge branch 'DATALAB-2232' of github.com:apache/incubator-dlab into DATALAB-2258
.../files/gcp/dataengine-service_description.json | 6 ++-
.../src/general/files/gcp/jupyter_description.json | 4 ++
.../DynamicChangePropertiesException.java | 19 ++++++++
.../computational/UserComputationalResource.java | 11 +++++
.../gcp/computational/ComputationalCreateGcp.java | 46 +++++++++++++++++
.../computational/GcpComputationalResource.java | 38 ++++++++++++---
.../dto/imagemetadata/ComputationalGPU.java} | 23 ++++++---
.../imagemetadata/ComputationalMetadataDTO.java | 5 ++
.../DynamicChangePropertiesExceptionMapper.java | 20 ++++++++
.../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 +-
.../resources/dto/ComputationalCreateFormDTO.java | 2 +
.../dto/gcp/GcpComputationalCreateForm.java | 17 +++++++
.../resources/gcp/ComputationalResourceGcp.java | 13 +++--
.../datalab/backendapi/service/TagService.java | 3 +-
.../datalab/backendapi/service/TagServiceImpl.java | 6 ++-
.../service/impl/ComputationalServiceImpl.java | 43 +++-------------
.../service/impl/DynamicChangeProperties.java | 19 ++++++++
.../service/impl/ExploratoryServiceImpl.java | 57 ++++------------------
.../impl/InfrastructureInfoServiceImpl.java | 1 +
.../impl/InfrastructureTemplateServiceImpl.java | 1 -
.../datalab/backendapi/util/RequestBuilder.java | 4 ++
.../resources/InfrastructureInfoResourceTest.java | 12 ++---
.../backendapi/service/TagServiceImplTest.java | 6 ++-
28 files changed, 264 insertions(+), 140 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org