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/09/26 08:26:06 UTC
[incubator-dlab] 01/01: Merge branch 'develop' of
github.com:apache/incubator-dlab into DLAB-1056
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0d0a1103f1a783bae8b8b215c59b66c007323a76
Merge: 4c32065 e56bf76
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 26 11:12:59 2019 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
.../src/general/scripts/azure/common_prepare_notebook.py | 8 +++++---
.../main/java/com/epam/dlab/model/exploratory/Image.java | 1 +
.../com/epam/dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java | 13 +++++++------
.../dlab/backendapi/resources/ImageExploratoryResource.java | 6 ++++--
.../epam/dlab/backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../dlab/backendapi/service/ImageExploratoryService.java | 2 +-
.../service/impl/ImageExploratoryServiceImpl.java | 5 +++--
.../backendapi/resources/ImageExploratoryResourceTest.java | 12 +++++++-----
.../service/impl/ImageExploratoryServiceImplTest.java | 8 ++++----
10 files changed, 34 insertions(+), 24 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org