Commits
Marcin Rochowiak authored 30ee714ac3dM
Merge remote-tracking branch 'origin/develop' into feature/dump-diff-processing # Conflicts: # 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 # 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 toab70042eab0