This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a0a86d0d92a4c93fc719cecb11782435059a4c56 Merge: 58740b2 9af7f10 Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Wed Jun 5 17:14:25 2019 +0300 Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects .../java/com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +- .../com/epam/dlab/backendapi/dao/ProjectDAOImpl.java | 5 +++-- .../com/epam/dlab/backendapi/dao/UserGroupDao.java | 2 ++ .../epam/dlab/backendapi/dao/UserGroupDaoImpl.java | 9 +++++++++ .../resources/InfrastructureInfoResource.java | 2 +- .../backendapi/resources/dto/HealthStatusPageDTO.java | 11 +++++++++++ .../backendapi/service/InfrastructureInfoService.java | 3 ++- .../epam/dlab/backendapi/service/ProjectService.java | 3 +++ .../service/impl/InfrastructureInfoServiceBase.java | 9 ++++++++- .../backendapi/service/impl/ProjectServiceImpl.java | 19 ++++++++++++++++++- .../resources/InfrastructureInfoResourceTest.java | 17 +++++++++-------- .../impl/InfrastructureInfoServiceBaseTest.java | 9 +++++++-- 12 files changed, 74 insertions(+), 17 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org