You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/03/04 11:31:51 UTC
[incubator-dlab] 01/02: Merge branch 'develop' into DLAB-1571
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d383c85482e05fbf8dc8f6477c22a81be1aa69a7
Merge: 3713da8 51afde3
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Wed Mar 4 11:22:52 2020 +0200
Merge branch 'develop' into DLAB-1571
README.md | 3 -
infrastructure-provisioning/scripts/deploy_dlab.py | 1 -
.../src/general/conf/dlab.ini | 4 +-
.../src/general/files/azure/jupyterlab_Dockerfile | 51 +++
.../files/azure/jupyterlab_description.json | 25 ++
.../general/files/gcp/jupyterlab_description.json | 2 +-
.../src/general/lib/gcp/meta_lib.py | 4 -
.../src/general/lib/os/debian/common_lib.py | 1 +
.../src/general/lib/os/debian/ssn_lib.py | 4 +
.../src/general/lib/os/fab.py | 27 +-
.../src/general/scripts/aws/ssn_configure.py | 4 -
.../general/scripts/azure/jupyterlab_configure.py | 398 +++++++++++++++++++++
.../src/general/scripts/azure/ssn_configure.py | 5 +-
...common_notebook_configure_dataengine-service.py | 12 +-
.../general/scripts/gcp/common_prepare_notebook.py | 18 +-
.../scripts/gcp/dataengine-service_prepare.py | 13 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 15 +-
.../src/general/scripts/gcp/ssn_configure.py | 68 ++--
.../src/general/scripts/gcp/ssn_prepare.py | 39 +-
.../jenkins_jobs/create_notebook_image/config.xml | 1 +
.../jenkins_jobs/create_notebook_server/config.xml | 1 +
.../jenkins_jobs/manage_git_credentials/config.xml | 1 +
.../jenkins_jobs/start_notebook_server/config.xml | 1 +
.../jenkins_jobs/stop_notebook_server/config.xml | 1 +
.../terminate_notebook_image/config.xml | 1 +
.../terminate_notebook_server/config.xml | 1 +
.../src/jupyterlab/Dockerfile_jupyterlab | 8 +-
.../scripts/configure_jupyterlab_node.py | 7 -
.../src/ssn/scripts/configure_ui.py | 2 +-
.../terraform/azure/endpoint/main/main.tf | 1 +
.../terraform/azure/endpoint/main/network.tf | 7 +-
.../project-list/project-list.component.html | 2 +-
.../app/administration/roles/roles.component.ts | 50 ++-
.../reporting-grid/reporting-grid.component.html | 7 +-
.../src/app/reporting/reporting.component.ts | 4 +-
.../resources-grid/resources-grid.component.scss | 1 +
.../confirmation-dialog-type.enum.ts | 3 +-
.../confirmation-dialog.component.html | 9 +-
.../webapp/src/assets/styles/_dialogs.scss | 6 +
.../webapp/src/dictionary/azure.dictionary.ts | 6 +-
40 files changed, 681 insertions(+), 133 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org