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/11/29 08:32:59 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1297
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1297
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 94520fbe87fc510c26bc17aadba05bc43ebdf354
Merge: 1ce5c1f 707e47f
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Nov 29 10:23:29 2019 +0200
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297
.../src/general/files/aws/base_Dockerfile | 2 +-
.../src/general/files/azure/base_Dockerfile | 2 +-
.../src/general/lib/os/debian/edge_lib.py | 61 ++++++++++++----
.../src/general/scripts/aws/edge_configure.py | 14 +++-
.../src/general/scripts/azure/edge_configure.py | 19 ++++-
.../src/general/scripts/gcp/edge_configure.py | 17 ++++-
.../src/project/scripts/configure_keycloak.py | 83 ++++++++++++++++++++++
.../scripts/configure_nginx_reverse_proxy.py | 11 +--
.../src/project/templates/conf.d/proxy.conf | 22 +++++-
.../src/project/templates/nginx.conf | 16 ++---
.../service/impl/ProjectServiceImpl.java | 36 ++++++----
11 files changed, 230 insertions(+), 53 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org