This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-2015
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 3a591554c004c3cfbc6d7a719baa7eef1f3bbeaf
Merge: 47ed005 1aeff4f
Author: Dmytro_Gnatyshyn <[email protected]>
AuthorDate: Mon Aug 31 17:33:21 2020 +0300

    Merge branch 'develop' of github.com:apache/incubator-dlab into develop

 .../src/general/files/aws/tensor_Dockerfile        |   1 +
 .../general/files/azure/deeplearning_Dockerfile    |   1 +
 .../src/general/files/azure/tensor_Dockerfile      |   1 +
 .../src/general/files/gcp/deeplearning_Dockerfile  |   1 +
 .../src/general/files/gcp/tensor_Dockerfile        |   1 +
 .../os/deeplearning_dataengine_create_configs.py   |  45 +-
 .../os/deeplearning_install_dataengine_kernels.py  |   9 +-
 .../scripts/os/tensor_dataengine_create_configs.py |  45 +-
 .../os/tensor_install_dataengine_kernels.py        |   9 +-
 .../terraform/bin/deploy/provisioning.yml          |   2 +-
 .../terraform/gcp/endpoint/provisioning.yml        |   2 +-
 services/provisioning-service/provisioning.yml     |   2 +-
 .../AutoCompleteEnum.java}                         |  14 +-
 .../dlab/backendapi/domain/ExploratoryLibList.java |   4 +-
 .../resources/InfrastructureInfoResource.java      |   2 +-
 .../resources/dto/LibraryAutoCompleteDTO.java      |   3 +-
 .../resources/dto/ProjectInfrastructureInfo.java   |   4 +
 .../service/InfrastructureInfoService.java         |   2 +-
 .../service/impl/BillingServiceImpl.java           |  49 +-
 .../impl/InfrastructureInfoServiceImpl.java        |  86 ++-
 .../manage-environment-dilog.component.ts          |   2 -
 .../audit/audit-grid/audit-grid.component.html     |   2 +-
 .../audit/audit-grid/audit-grid.component.scss     |   8 +-
 .../reporting-grid/reporting-grid.component.html   | 489 ++++++++--------
 .../reporting-grid/reporting-grid.component.scss   |  38 +-
 .../reporting-grid/reporting-grid.component.ts     |  59 +-
 .../app/reports/reporting/reporting.component.ts   |   9 +-
 .../install-libraries.component.html               |  27 +-
 .../install-libraries.component.scss               |   1 +
 .../install-libraries.component.ts                 |  23 +-
 .../src/app/shared/navbar/navbar.component.html    |   1 -
 .../src/app/shared/navbar/navbar.component.ts      |  16 +-
 .../webapp/src/assets/styles/_general.scss         |  34 ++
 .../src/main/resources/webapp/src/styles.scss      |   5 +-
 .../resources/InfrastructureInfoResourceTest.java  |  19 +-
 .../service/impl/BillingServiceImplTest.java       | 619 ++++++++++++++++++++-
 .../impl/InfrastructureInfoServiceImplTest.java    | 387 +++++++++++++
 37 files changed, 1599 insertions(+), 423 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to