Mentions légales du service

Skip to content

Merge branch dev of @mmercier

MOMMESSIN Clement requested to merge new-dev into master

I cherry-picked in master the two new commits of the dev branch, but I'm not sure the decisions I made to resolve merge conflicts were coherent with what you had in mind @mmercier when you did these modifications.

Moreover, in the "handle_submit_job" of protocol.cpp (there: https://gitlab.inria.fr/batsim/batsim/blob/new-dev/src/protocol.cpp#L1313) there is still mention to profiles, which I don't get why...

Merge request reports