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/02 12:10:04 UTC
[incubator-dlab] 05/05: 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 595c24f388f9df4258628b3164164e3cbf2c1251
Merge: 3653ab3 cb60569
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 2 15:09:40 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
infrastructure-provisioning/src/edge/fabfile.py | 147 ++++---
.../src/general/lib/os/debian/edge_lib.py | 4 +-
.../src/general/lib/os/redhat/edge_lib.py | 4 +-
.../src/general/scripts/aws/project_prepare.py | 6 +
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../src/general/scripts/gcp/project_prepare.py | 467 +++++++++++++++++++++
.../src/general/scripts/gcp/ssn_configure.py | 2 +-
.../scripts/configure_nginx_reverse_proxy.py | 17 +-
.../src/project/templates/nginx.conf | 20 +-
...CreateProjectResult.java => ProjectResult.java} | 2 +-
.../dlab/dto/{ => project}/ProjectCreateDTO.java | 3 +-
.../epam/dlab/dto/project/ProjectTerminateDTO.java | 13 +
.../response/handlers/ProjectCallbackHandler.java | 12 +-
.../dlab/backendapi/resources/ProjectResource.java | 12 +-
.../dlab/backendapi/service/ProjectService.java | 4 +-
.../service/impl/ProjectServiceImpl.java | 22 +-
.../mock_response/gcp/project_terminate.json | 12 +
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 9 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java | 12 +-
.../dlab/backendapi/resources/ProjectResource.java | 6 +-
.../resources/callback/ProjectCallback.java | 14 +-
.../dlab/backendapi/service/ProjectService.java | 3 +-
.../service/impl/ProjectServiceImpl.java | 25 +-
24 files changed, 680 insertions(+), 139 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org