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/10/21 10:12:06 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1057
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1057
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit be2e4e546c8b7c05052b29e12a78824b39d8c310
Merge: 523d78d 32021a5
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Oct 21 13:09:06 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1057
.../src/general/scripts/azure/dataengine_configure.py | 6 +++---
.../src/general/scripts/gcp/dataengine_configure.py | 5 +++--
.../src/ssn/scripts/configure_ssn_node.py | 2 +-
.../src/ssn/{templates => scripts}/docker_build.py | 3 ++-
infrastructure-provisioning/src/ssn/templates/ssn.yml | 18 +++++++++---------
.../java/com/epam/dlab/mongo/DlabResourceTypeDAO.java | 19 ++++++++++++-------
.../billing/azure/AzureBillableResourcesService.java | 17 ++++++++++++-----
.../com/epam/dlab/billing/gcp/documents/Project.java | 13 +++++++++++--
.../dlab/billing/gcp/service/BillingServiceImpl.java | 14 +++++++++++---
.../com/epam/dlab/billing/gcp/util/BillingUtils.java | 7 ++++---
.../epam/dlab/dto/exploratory/ExploratoryBaseDTO.java | 14 ++++++++++++++
.../com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 15 ++++++++++++---
.../dlab/backendapi/modules/GcpSelfServiceModule.java | 8 ++++++++
.../com/epam/dlab/backendapi/util/RequestBuilder.java | 9 ++++++---
14 files changed, 108 insertions(+), 42 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org