You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2019/12/11 08:58:04 UTC
[incubator-dlab] 01/01: Merge remote-tracking branch
'remotes/origin/develop' into DLAB-13xx_versions
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-13xx_versions
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c0ee3544b31bf6c0b322aa1aff2d8a2e3741bcb9
Merge: 515985e 637500d
Author: Mykola_Bodnar1 <bo...@gmail.com>
AuthorDate: Wed Dec 11 10:44:18 2019 +0200
Merge remote-tracking branch 'remotes/origin/develop' into DLAB-13xx_versions
README.md | 2 +-
.../src/general/conf/dlab.ini | 2 +
.../general/files/gcp/superset_description.json | 2 +-
.../src/general/lib/os/debian/edge_lib.py | 4 +-
.../src/general/lib/os/fab.py | 65 +++-----------
.../general/scripts/aws/jupyterlab_configure.py | 20 +++++
.../src/general/scripts/aws/project_prepare.py | 7 --
.../src/general/scripts/azure/edge_configure.py | 2 +-
.../src/general/scripts/azure/project_prepare.py | 2 +-
.../general/scripts/gcp/jupyterlab_configure.py | 21 +++++
.../src/general/scripts/gcp/superset_configure.py | 65 +++++++++++++-
...iner_start.py => configure_proxy_for_docker.py} | 42 +++++-----
.../scripts/os/jupyterlab_container_start.py | 4 +-
...terlab_container_start.py => superset_start.py} | 27 +++---
.../scripts/configure_jupyterlab_node.py | 2 +-
.../src/project/templates/conf.d/proxy.conf | 2 +-
.../src/project/templates/nginx.conf | 4 +-
.../src/ssn/files/gcp/mongo_roles.json | 10 +++
.../superset/scripts/configure_superset_node.py | 17 +++-
.../src/superset/templates/id_provider.json | 10 +--
.../src/superset/templates/superset_config.py | 2 +-
.../com/epam/dlab/mongo/DlabResourceTypeDAO.java | 6 +-
.../java/com/epam/dlab/model/aws/ReportLine.java | 1 +
.../core/commands/CommandExecutorMock.java | 1 +
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 11 ++-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 5 +-
.../backendapi/service/aws/AwsBillingService.java | 2 +
.../service/azure/AzureBillingService.java | 3 +
.../backendapi/service/gcp/GcpBillingService.java | 2 +
.../impl/InfrastructureTemplateServiceBase.java | 6 +-
.../service/impl/ProjectServiceImpl.java | 31 ++++---
.../src/main/resources/mongo/gcp/mongo_roles.json | 10 +++
.../management-grid/management-grid.component.scss | 2 +-
.../management-grid/management-grid.component.ts | 4 +-
.../project-list/project-list.component.html | 9 +-
.../project/project-list/project-list.component.ts | 4 +-
.../administration/project/project.component.ts | 4 +-
.../app/administration/roles/roles.component.ts | 6 +-
.../reporting-grid/reporting-grid.component.html | 4 +-
.../reporting-grid/reporting-grid.component.scss | 49 ++++++++++-
.../cluster-details/cluster-details.component.html | 7 +-
...utational-resource-create-dialog.component.html | 6 +-
...mputational-resource-create-dialog.component.ts | 2 +-
.../computational-resources-list.component.scss | 3 +
.../computational-resources-list.component.ts | 14 ++--
.../create-environment.component.html | 32 +++----
.../detail-dialog/detail-dialog.component.html | 23 +++--
.../detail-dialog/detail-dialog.component.scss | 17 ++--
.../install-libraries/filter-libs.model.ts} | 21 ++++-
.../install-libraries.component.html | 98 ++++++++++++++++++++--
.../install-libraries.component.scss | 74 +++++++++++++---
.../install-libraries.component.ts | 47 +++++++++++
.../resources-grid/resources-grid.component.html | 15 ++--
.../resources-grid/resources-grid.component.ts | 1 -
.../shared/form-controls/dropdowns.component.scss | 4 +-
.../confirmation-dialog.component.html | 4 +-
.../notification-dialog.component.ts | 34 +++++---
.../webapp/src/assets/styles/_dialogs.scss | 15 ++--
.../webapp/src/assets/styles/_variables.scss | 6 +-
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 4 +-
.../src/main/resources/webapp/src/styles.scss | 9 +-
.../service/aws/AwsBillingServiceTest.java | 16 ++--
.../service/azure/AzureBillingServiceTest.java | 20 ++---
.../InfrastructureTemplateServiceBaseTest.java | 9 +-
66 files changed, 656 insertions(+), 305 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org