Skip to content
Snippets Groups Projects
Commit 9b31efda authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-15.08' into slurm-16.05 

# Conflicts:
#	src/common/slurm_acct_gather_energy.c
#	src/common/slurm_acct_gather_filesystem.c
#	src/common/slurm_acct_gather_infiniband.c
#	src/common/slurm_acct_gather_profile.c
#	src/common/slurm_jobacct_gather.c
parents 139102f0 b1fbeb85
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung