Skip to content
GitLab
Commit 94b0a179 authored by jette's avatar jette
Browse files

Merge branch 'slurm-15.08' 

Conflicts:
	src/plugins/jobcomp/elasticsearch/jobcomp_elasticsearch.c
parents 862f3c8e d0692ec2
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