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:05 UTC
[incubator-dlab] branch DLAB-1057 updated (523d78d -> be2e4e5)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1057
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 523d78d [DLAB-1157]: keep selected project on active filtering
add 5956ace [DLAB-1120] Fixed dataengine issue and updated docker-build script
add 7649b62 Merge pull request #347 from apache/DLAB-1120
add f6d2659 [DLAB-1138] Added quota for GCP
add b87a6c2 [DLAB-1138] Fixed issue with dublicate key in billing-gcp
add bb8b0c9 Merge pull request #349 from apache/DLAB-1138
add 412d69a DLAB-1183 fixed issue with billing for edges
add 32021a5 DLAB-000 added endpoint parameter for exploratory start/stop
new be2e4e5 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1057
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
rename infrastructure-provisioning/src/ssn/{templates => scripts}/docker_build.py (97%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1057
Posted by an...@apache.org.
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