Skip to content
GitLab
Commit 3b101d38 authored by alejluther's avatar alejluther
Browse files

Merge branch 'master' of https://github.com/SchedMD/slurm 

Conflicts:
	src/plugins/select/cons_res/select_cons_res.c
	src/slurmctld/reservation.c
parents ad6138a1 94bebf38
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment