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/22 14:59:45 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-814
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-814
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2f3544142c554da1b2a36c27cc57597265764f38
Merge: 35d430d f772a89
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 22 17:58:28 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-814
infrastructure-provisioning/scripts/deploy_dlab.py | 1 +
infrastructure-provisioning/src/edge/fabfile.py | 2 +-
.../src/general/api/status.py | 4 +-
.../src/general/lib/aws/actions_lib.py | 6 ++
.../src/general/lib/os/debian/ssn_lib.py | 4 +-
.../src/general/lib/os/redhat/ssn_lib.py | 4 +-
.../scripts/aws/dataengine-service_create.py | 6 ++
.../src/general/scripts/aws/dataengine_prepare.py | 6 ++
.../src/general/scripts/aws/edge_status.py | 2 +-
.../src/general/scripts/aws/project_prepare.py | 12 +++
.../src/general/scripts/aws/project_terminate.py | 33 ++++--
.../src/general/scripts/aws/ssn_configure.py | 2 +
.../src/general/scripts/gcp/edge_configure.py | 1 +
.../src/ssn/scripts/configure_billing.py | 3 +-
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/nginx_proxy.conf | 3 +-
integration-tests-cucumber/pom.xml | 114 +++++++++++++++++++++
.../main/java/org/apache/dlab/dto/EndpointDTO.java | 19 ++++
.../java/org/apache/dlab/mongo/MongoDBHelper.java | 14 +++
.../java/org/apache/dlab/util/JacksonMapper.java | 16 +++
.../java/org/apache/dlab/util/PropertyHelper.java | 23 +++++
.../src/test/java/dlab/Constants.java | 5 +
.../src/test/java/dlab/RunCucumberTest.java | 10 ++
.../src/test/java/dlab/endpoint/EndpointSteps.java | 97 ++++++++++++++++++
.../src/test/java/dlab/login/LoginSteps.java | 44 ++++++++
.../src/test/resources/config.properties | 2 +
.../src/test/resources/dlab/endpoint.feature | 57 +++++++++++
.../src/test/resources/dlab/login.feature | 12 +++
services/billing-aws/billing.yml | 2 +-
.../dto/base/computational/ComputationalBase.java | 10 ++
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 7 +-
.../dlab/backendapi/resources/ProjectResource.java | 9 +-
.../resources/callback/ProjectCallback.java | 12 ++-
.../backendapi/service/EnvironmentService.java | 2 +-
.../backendapi/service/ExploratoryService.java | 1 +
.../service/impl/EnvironmentServiceImpl.java | 9 --
.../service/impl/ExploratoryServiceImpl.java | 8 +-
.../service/impl/ProjectServiceImpl.java | 13 ++-
.../epam/dlab/backendapi/util/RequestBuilder.java | 6 +-
.../resources-grid/resources-grid.component.html | 21 ++--
.../resources-grid/resources-grid.component.scss | 4 +-
.../resources-grid/resources-grid.component.ts | 82 +++++++--------
.../src/app/resources/resources.component.html | 4 +-
.../src/app/resources/resources.component.ts | 1 +
45 files changed, 596 insertions(+), 102 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org