Commits
Marcin Rochowiak authored 68f670f499bM
Merge remote-tracking branch 'origin/feature/sparkjob_processing' into sub-sparkjob_processing # Conflicts: # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/oag/job/OagResourcesPreprocJobLauncher.java # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/processing/ProcessingBrokerImpl.java # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/processing/SparkStatusPublisherImpl.java # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/processing/command/OagProcessingCommand.java # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/processing/listener/SparkJobFinalStatusForwardingListener.java # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/processing/listener/SparkJobProcessingTrigger.java # application/src/main/java/pl/psnc/eosc/rs/preprocessor/app/diagnostic/ApiController.java # application/src/main/resources/application.properties # application/src/test/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/ProcessingBrokerTest.java # application/src/test/java/pl/psnc/eosc/rs/preprocessor/app/context/spark/SparkJobProcessingTriggerTest.java # oag-resources-preproc-sparkjob/src/main/java/pl/psnc/eosc/rs/preprocessor/oag/job/OagResourcesPreprocSparkJob.java
Showing diff toc8bfd9c0f10