Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

hpc-workflow-manager
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

fd002dc1

Commit fd002dc1 authored 7 years ago by Jan Kožusznik

Downloads
- Plain Diff

Merge branch 'master' into iss1007-provideTaskInfos

parents 6ba47ee7 d14e2226

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/JobState.java 7 additions, 6 deletions

...src/main/java/cz/it4i/fiji/haas_java_client/JobState.java
haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java 39 additions, 31 deletions

...4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java
haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java.orig 0 additions, 420 deletions

...ji/haas_spim_benchmark/core/BenchmarkJobManager.java.orig
haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/SPIMComputationAccessor.java 3 additions, 1 deletion

...iji/haas_spim_benchmark/core/SPIMComputationAccessor.java
haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/Task.java 9 additions, 19 deletions

...main/java/cz/it4i/fiji/haas_spim_benchmark/core/Task.java
haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java 82 additions, 41 deletions

...z/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java

with 140 additions and 518 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment