You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/10 15:53:22 UTC
[incubator-dlab] 19/19: Merge branch 'feature/projects' of
github.com:apache/incubator-dlab into feature/projects
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6c3694bdfc67e254a9f447a517b49a591923199c
Merge: b50ad5c 6667d10
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jul 10 18:52:41 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
infrastructure-provisioning/scripts/deploy_dlab.py | 16 ++--
.../src/general/lib/os/redhat/common_lib.py | 2 +-
.../src/general/lib/os/redhat/notebook_lib.py | 2 +-
.../src/ssn/scripts/configure_billing.py | 2 -
.../src/ssn/templates/ssn_nginx.conf | 1 +
.../com/epam/dlab/module/aws/AdapterS3File.java | 93 +++-------------------
.../java/com/epam/dlab/module/aws/S3FileList.java | 2 +-
.../java/com/epam/dlab/dto/status/EnvResource.java | 5 +-
.../service/impl/ProjectServiceImpl.java | 2 +-
.../mock_response/gcp/notebook_create.json | 1 +
.../java/com/epam/dlab/backendapi/dao/EnvDAO.java | 39 +++------
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 5 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 14 +++-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 18 +++--
.../dlab/backendapi/domain/UpdateProjectDTO.java | 19 +++++
.../dlab/backendapi/resources/ProjectResource.java | 3 +-
.../resources/aws/ComputationalResourceAws.java | 22 ++---
.../dlab/backendapi/service/ProjectService.java | 7 +-
.../service/impl/EnvironmentServiceImpl.java | 4 +-
.../service/impl/ProjectServiceImpl.java | 8 +-
.../epam/dlab/backendapi/util/RequestBuilder.java | 9 ++-
.../service/impl/EnvironmentServiceImplTest.java | 4 +-
22 files changed, 130 insertions(+), 148 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org