Skip to content
GitLab
Commit cece4135 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-15.08' 

Conflicts:
	src/plugins/jobcomp/elasticsearch/jobcomp_elasticsearch.c
parents d609800a a5b9d534
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