diff options
| author | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2016-06-30 09:13:24 -0400 |
|---|---|---|
| committer | Elizabeth Fischer <elizabeth.fischer@columbia.edu> | 2016-06-30 09:13:24 -0400 |
| commit | 50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4 (patch) | |
| tree | e190a29f85712b580d48d0ae6bca24367245f42c /.gitignore | |
| parent | efa506b235523c8a9a925c1ecf91690266da4fd4 (diff) | |
| parent | 0e422dec8c8d075e68c31b032628b7d4db96c552 (diff) | |
| download | spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.gz spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.bz2 spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.tar.xz spack-50ac98bc04d9be2eead0b31e0a898a2dfd24a7a4.zip | |
Merge remote-tracking branch 'upstream/develop' into efischer/160630-StagedPackage
# Conflicts:
# lib/spack/docs/packaging_guide.rst
# lib/spack/spack/package.py
Mostly minor/formatting issues in lib/spack/spack/package.py (the heavyweight merge was already done recently). Only one serious issue: it looks like the feature branch had accidentally deleted the line `spack.hooks.post_install(self)`. This got added back in from develop.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4b97de5d50..040df3eafd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /var/spack/stage +/var/spack/cache *.pyc /opt/ *~ @@ -9,3 +10,5 @@ /share/spack/dotkit /share/spack/modules /TAGS +/htmlcov +.coverage |