Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Manuel G. Marciani
ces_slurm_simulator
Commits
821c8bb8
Commit
821c8bb8
authored
Jul 27, 2015
by
Morris Jette
Browse files
Merge branch 'slurm-14.11'
Conflicts: slurm/slurm.h.in src/slurmctld/job_scheduler.c src/slurmd/slurmstepd/task.c
parents
6c425ca9
18bbf378
Changes
5
Hide whitespace changes
Inline
Side-by-side
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment