Skip to content
GitLab
Commit cdcb045c authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/tres_limits' 

Conflicts:
	src/common/slurmdbd_defs.c
	src/slurmctld/job_mgr.c
parents 13978803 967b57e4
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