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/16 10:22:03 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1157
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1157
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit af5dd307e7d0815cbb6fdd3b235ec08d458f7c7d
Merge: 613c41c 2c8191a
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Oct 16 13:17:01 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1157
services/billing-azure/billing.yml | 4 +
.../azure/AzureBillableResourcesService.java | 13 ++--
.../dlab/billing/azure/BillingSchedulerAzure.java | 5 +-
.../azure/config/BillingConfigurationAzure.java | 4 +
services/self-service/self-service.yml | 12 +--
.../conf/SelfServiceApplicationConfiguration.java | 7 ++
.../com/epam/dlab/backendapi/dao/SecurityDAO.java | 12 ++-
.../dropwizard/listeners/MongoStartupListener.java | 4 +
.../backendapi/resources/KeycloakResource.java | 2 +-
.../com/epam/dlab/backendapi/roles/UserRoles.java | 4 +-
.../dlab/backendapi/service/KeycloakService.java | 1 +
.../backendapi/service/KeycloakServiceImpl.java | 14 +++-
.../administration/project/project.component.ts | 12 ++-
.../backendapi/resources/KeycloakResourceTest.java | 4 +-
.../service/KeycloakServiceImplTest.java | 85 ++++++++++++++++++++++
15 files changed, 163 insertions(+), 20 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org