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:
Jim Galarowicz 2017-07-27 09:37:24 -05:00
commit 00518ce503

Diff Content Not Available