• jette's avatar
    Merge branch 'slurm-2.6' · da0bd5e1
    jette authored
    Conflicts:
    	NEWS
    	testsuite/expect/Makefile.am
    	testsuite/expect/Makefile.in
    	testsuite/expect/README
    da0bd5e1
To find the state of this project's repository at the time of any of these versions, check out the tags.