You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/07/28 14:49:31 UTC
[incubator-dlab] 03/10: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1943
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1943
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 45da77212a6b61ebe0e1f969b05feebf6517c712
Merge: 6d307da 1759f9e
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Jul 20 10:23:54 2020 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1943
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 28 +------------
.../com/epam/dlab/backendapi/dao/BillingDAO.java | 8 +---
.../interceptor/BudgetLimitInterceptor.java | 5 ++-
.../dlab/backendapi/resources/BillingResource.java | 8 ++++
.../resources/dto/HealthStatusPageDTO.java | 4 --
.../dto/QuotaUsageDTO.java} | 22 ++++------
.../schedulers/CheckProjectQuoteScheduler.java | 6 +--
.../dlab/backendapi/service/BillingService.java | 15 +++++--
.../service/impl/BillingServiceImpl.java | 48 +++++++++++++++++++++-
.../impl/InfrastructureInfoServiceImpl.java | 11 ++---
10 files changed, 89 insertions(+), 66 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org