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/05/07 14:14:47 UTC
[incubator-dlab] 01/05: Merge remote-tracking branch
'remotes/origin/feature-DLAB-2' into DLAB-4
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-4
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c31320371fbbbec707c831d4e446e355d7a9c44b
Merge: 0533553 d9af232
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue May 7 14:16:38 2019 +0300
Merge remote-tracking branch 'remotes/origin/feature-DLAB-2' into DLAB-4
services/self-service/pom.xml | 6 +++
services/self-service/self-service.yml | 13 ++++-
.../dlab/backendapi/SelfServiceApplication.java | 13 +++++
.../SelfServiceApplicationConfiguration.java | 16 +++++++
.../epam/dlab/backendapi/modules/DevModule.java | 17 +++++--
.../dlab/backendapi/modules/ProductionModule.java | 1 +
.../dlab/backendapi/service/GuacamoleService.java | 10 ++++
.../service/impl/GuacamoleServiceImpl.java | 56 ++++++++++++++++++++++
.../servlet/guacamole/GuacamoleSecurityFilter.java | 56 ++++++++++++++++++++++
.../servlet/guacamole/GuacamoleServlet.java | 32 +++++++++++++
10 files changed, 214 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org