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
6c71e82d
Commit
6c71e82d
authored
Dec 02, 2014
by
Brian Christiansen
Browse files
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11
Conflicts: src/plugins/task/cray/task_cray.c
parents
1e578c90
87737895
Changes
3
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