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:58 UTC
[incubator-dlab] branch DLAB-1297 updated (1ce5c1f -> 94520fb)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1297
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 1ce5c1f [DLAB-1297]: fixed initial login issue
add 2036c26 Merge branch 'develop' of C:\Users\Mykola_Bodnar1\Documents\DLab\incubator-dlab with conflicts.
add cde3403 Merge pull request #27 from apache/develop
add bdac58d Merge remote-tracking branch 'origin/develop' into develop
add 8f0a7a9 SSO implementing
add d11e5a3 SSO implementing
add 9cd0f2d SSO bugs fixing
add b6455d5 SSO bugs fixed
add cb52717 SSO nginx config fixed
add 6af33db SSO nginx config fixed
add d497551 SSO added for Azure and AWS
add 8b77cc1 SSO for notebooks implemented
add 6a4a7af merge conflict fixed
add bf50025 Merge pull request #28 from apache/develop
add 85afc5b Merge remote-tracking branch 'origin/notebooks-sso' into notebook-sso
add f207298 Merge pull request #458 from bodnarmykola/notebooks-sso
add 12f3845 [DLAB-1316, DLAB-1314] Fixed issues with stopping/terminating actions on manage environment popup
add 5f11c8e merge conflict fixed
add 707e47f Merge pull request #459 from bodnarmykola/notebooks-sso
new 94520fb Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
create mode 100644 infrastructure-provisioning/src/project/scripts/configure_keycloak.py
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1297
Posted by an...@apache.org.
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