Skip to content
Snippets Groups Projects
Commit 9aa2d077 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-17.11' into slurm-18.08

parents 917e8439 7471cfbf
No related branches found
No related tags found
No related merge requests found
...@@ -56,5 +56,6 @@ autom4te.cache ...@@ -56,5 +56,6 @@ autom4te.cache
/src/sstat/sstat /src/sstat/sstat
/src/strigger/strigger /src/strigger/strigger
/src/sview/sview /src/sview/sview
testsuite/expect/globals.local /testsuite/expect/globals.local
/testsuite/expect/*.log*
TAGS TAGS
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment