Commits
Marcin Rochowiak authored ab70042eab0M
Merge remote-tracking branch 'origin/develop' into feature/dump-diff-processing # Conflicts: # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/processing/ProcessingBrokerImpl.java # marketplace-resources-preproc-sparkjob/src/main/java/pl/psnc/eosc/rs/preprocessor/job/marketplace/MarketplaceResourcesPreprocSparkJob.java # oag-resources-preproc-sparkjob/src/main/java/pl/psnc/eosc/rs/preprocessor/oag/job/OagResourcesPreprocSparkJob.java # oag-resources-preproc-sparkjob/src/test/java/pl/psnc/eosc/rs/preprocessor/oag/csv/OagCsvParsingTest.java # spark-shared-processing/pom.xml # spark-shared-processing/src/main/java/pl/psnc/eosc/rs/preprocessor/shared/SparkSharedResourcesPreprocessing.java # trainings-preproc-sparkjob/src/main/java/pl/psnc/eosc/rs/preprocessor/job/training/TrainingsPreprocSparkJob.java # trainings-preproc-sparkjob/src/test/java/pl/psnc/eosc/rs/preprocessor/job/training/TrainingsTransformationTest.java
Showing diff toc3e9b445a8f