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

Merge remote-tracking branch 'origin/slurm-2.6' 

Conflicts:
	src/common/read_config.c
	src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
	src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
	src/slurmctld/job_mgr.c
parents 46680f0c 9eba4384
Expand all 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