Merge branch 'krell_spack_updates' of https://github.com/jgalarowicz/spack into krell_spack_updates
Conflicts: var/spack/repos/builtin/packages/openspeedshop/package.py
This commit is contained in:
commit
00518ce503
Conflicts: var/spack/repos/builtin/packages/openspeedshop/package.py