Skip to content
GitLab
Commit 47a31e7d authored by Danny Auble's avatar Danny Auble
Browse files

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

# Conflicts:
#	src/plugins/jobcomp/elasticsearch/jobcomp_elasticsearch.c
parents 107ee3c4 0a4d5770
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