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
Please register or sign in to comment