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/08 13:32:23 UTC

[incubator-dlab] 02/03: Merge branch 'develop' of github.com:apache/incubator-dlab 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 3213cf3785947c5b4d46f9dc67f5131ad9cfd292
Merge: 7639229 87ddd9b
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed May 8 14:43:40 2019 +0300

    Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-4

 .../src/general/conf/dlab.ini                      |  2 +-
 .../general/files/aws/zeppelin_description.json    |  4 +--
 .../general/files/azure/zeppelin_description.json  |  4 +--
 .../files/gcp/dataengine-service_description.json  |  2 +-
 .../general/files/gcp/zeppelin_description.json    |  4 +--
 .../zeppelin/zeppelin-notebook.json                |  4 +--
 .../ec2_templates/zeppelin/zeppelin-notebook.json  |  4 +--
 .../gcp_templates/zeppelin/zeppelin-notebook.json  |  4 +--
 .../key-upload-dialog.component.ts                 |  2 +-
 .../app/shared/modal-dialog/modal.component.html   | 41 +++++++++++-----------
 .../app/shared/modal-dialog/modal.component.scss   | 17 ---------
 .../notification-dialog.component.ts               |  4 +--
 .../src/app/shared/navbar/navbar.component.html    |  6 ++--
 .../src/app/shared/navbar/navbar.component.scss    |  8 ++++-
 .../webapp/src/assets/styles/_general.scss         | 18 +++++++++-
 15 files changed, 65 insertions(+), 59 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org