This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DATALAB-new-jars-sufix-in-dockerfiles in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 370192597557110e4b72a818d789ed58d054a177 Merge: 86d2287 57d3233 Author: leonidfrolov <[email protected]> AuthorDate: Tue Jul 13 14:01:46 2021 +0300 Merge branch 'develop' into DATALAB-new-jars-sufix-in-dockerfiles build.properties | 2 +- .../src/general/lib/os/fab.py | 3 +- .../datalab/properties/ChangePropertiesConst.java | 8 +- .../properties/ChangePropertiesService.java | 124 ++++++++++++--------- .../handlers/ComputationalCallbackHandler.java | 3 - .../response/handlers/EdgeCallbackHandler.java | 1 - .../response/handlers/ProjectCallbackHandler.java | 5 - .../response/handlers/ResourceCallbackHandler.java | 3 - .../handlers/dao/FileSystemCallbackHandlerDao.java | 1 - .../resources/base/ExploratoryService.java | 3 - .../resources/ChangePropertiesResource.java | 3 - .../resources/callback/ComputationalCallback.java | 2 - .../resources/callback/ProjectCallback.java | 3 - .../service/impl/ComputationalServiceImpl.java | 7 -- .../service/impl/ExploratoryServiceImpl.java | 1 - .../impl/InfrastructureInfoServiceImpl.java | 5 - .../datalab/backendapi/util/RequestBuilder.java | 5 - .../service/impl/BillingServiceImplTest.java | 22 ++-- .../service/impl/ComputationalServiceImplTest.java | 6 +- .../service/impl/EnvironmentServiceImplTest.java | 11 +- .../service/impl/ExploratoryServiceImplTest.java | 31 +++++- .../InfrastructureTemplateServiceBaseTest.java | 22 +--- .../service/impl/SystemInfoServiceImplTest.java | 2 +- .../datalab/backendapi/util/CSVFormatterTest.java | 4 +- 24 files changed, 144 insertions(+), 133 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
