tree 1dc20f7d2fc0f7203800de0df579f1fe481bf00a
parent 8a40f7a86e7ef801df1c1ecee39be3883ddfb186
parent 19c599e7e24566ddeafa1eb255694812313622ad
author Oleh Fuks <olegfuks98@gmail.com> 1604508731 +0200
committer Oleh Fuks <olegfuks98@gmail.com> 1604508731 +0200

Merge remote-tracking branch 'origin/DATALAB-1895' into DATALAB-1895

# Conflicts:
#	services/self-service/src/main/java/com/epam/datalab/backendapi/dao/ExploratoryDAO.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/schedulers/CheckInfrastructureStatusScheduler.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/service/InfrastructureInfoService.java
#	services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/InfrastructureInfoServiceImpl.java