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 0604e6212d3683c26ebf83f38aab43e7c1377d41
Merge: b99306e 2ff5858
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Tue Jun 18 20:46:46 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into
feature/projects
.../java/com/epam/dlab/dto/UserInstanceDTO.java | 12 ++++---
.../computational/AwsComputationalResource.java | 5 +--
.../SparkStandaloneClusterResource.java | 5 +--
.../computational/UserComputationalResource.java | 5 ++-
.../dlab/dto/exploratory/ExploratoryCreateDTO.java | 22 ++++++++++++
.../computational/GcpComputationalResource.java | 6 ++--
.../epam/dlab/model/exploratory/Exploratory.java | 2 ++
.../epam/dlab/backendapi/domain/EndpointDTO.java | 1 +
.../epam/dlab/backendapi/domain/ProjectDTO.java | 2 ++
.../epam/dlab/backendapi/modules/DevModule.java | 1 +
.../dlab/backendapi/modules/ProductionModule.java | 1 +
.../backendapi/resources/ExploratoryResource.java | 2 ++
.../resources/dto/ComputationalCreateFormDTO.java | 2 ++
.../resources/dto/ExploratoryCreateFormDTO.java | 6 ++++
.../epam/dlab/backendapi/service/TagService.java | 9 +++++
.../dlab/backendapi/service/TagServiceImpl.java | 40 ++++++++++++++++++++++
.../service/impl/ComputationalServiceImpl.java | 24 ++++++++-----
.../service/impl/ExploratoryServiceImpl.java | 13 +++++--
.../epam/dlab/backendapi/util/RequestBuilder.java | 12 ++++---
.../resources/ExploratoryResourceTest.java | 14 +++++---
.../service/impl/ComputationalServiceImplTest.java | 30 ++++++++++------
.../service/impl/ExploratoryServiceImplTest.java | 28 +++++++++------
.../InfrastructureTemplateServiceBaseTest.java | 6 ++--
.../dlab/backendapi/util/RequestBuilderTest.java | 6 ++--
24 files changed, 196 insertions(+), 58 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
