This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch audit
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 80323538fd8fb806a2a0dc1b0610379b2dde52a5
Merge: 2c5c0f7 28ed0cb
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Tue Jun 9 14:34:05 2020 +0300
Merge remote-tracking branch 'origin/audit' into audit
# Conflicts:
#
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAO.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/dao/AuditDAOImpl.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditActionEnum.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditCreateDTO.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/domain/AuditDTO.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/interceptor/AuditInterceptor.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/service/AuditService.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/AuditServiceImpl.java
#
services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
