This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1456
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0a845205f2f71581af4d7ac544064c707144271e
Merge: d1c3de6 a4642f6
Author: Dmytro Gnatyshyn <di1...@ukr.net>
AuthorDate: Mon Jan 20 09:21:52 2020 +0200
Merge branch 'develop' of github.com:apache/incubator-dlab into develop
.../scripts/deploy_repository/deploy_repository.py | 14 ++++++-------
.../src/general/lib/azure/actions_lib.py | 12 +++++------
.../src/general/lib/gcp/actions_lib.py | 2 +-
.../src/general/lib/os/fab.py | 14 ++++++-------
.../scripts/aws/dataengine-service_jars_parser.py | 13 ++++++++++++
.../jupyter_dataengine-service_create_configs.py | 19 +++++++++---------
.../jupyter_install_dataengine-service_kernels.py | 7 ++++++-
.../general/templates/aws/interpreter_livy.json | 2 +-
.../general/templates/aws/interpreter_spark.json | 2 +-
.../general/templates/azure/interpreter_livy.json | 2 +-
.../general/templates/azure/interpreter_spark.json | 2 +-
.../general/templates/gcp/interpreter_livy.json | 2 +-
.../general/templates/gcp/interpreter_spark.json | 2 +-
.../src/jupyter/scripts/configure_jupyter_node.py | 3 ++-
.../management-grid/management-grid.component.html | 2 +-
.../management-grid/management-grid.component.scss | 3 +--
.../project/project-form/project-form.component.ts | 2 +-
.../app/administration/roles/roles.component.html | 6 +++---
...utational-resource-create-dialog.component.html | 13 +++++-------
.../create-environment.component.html | 15 +++++---------
.../resources-grid/resources-grid.component.html | 7 +++----
.../resources-grid/resources-grid.component.scss | 4 ++--
.../webapp/src/assets/styles/_general.scss | 5 +++--
.../resources/webapp/src/assets/styles/_reset.scss | 2 +-
.../resources/webapp/src/assets/styles/_theme.scss | 23 +++++++++++++++++++++-
25 files changed, 105 insertions(+), 73 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
