diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-18 16:16:20 -0700 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-05-18 16:16:20 -0700 |
commit | f813d823a14f25a8f06c2f0bb7ba88db33c0af68 (patch) | |
tree | cb7be41ae3142157bd18e4f7d00107cc624ee1d2 /.gitignore | |
parent | 09151785b3353c0169a6c41771cd471c5207d2cf (diff) | |
parent | f68e64d738054a01b38fd6840fc7932c0912a85c (diff) | |
download | spack-f813d823a14f25a8f06c2f0bb7ba88db33c0af68.tar.gz spack-f813d823a14f25a8f06c2f0bb7ba88db33c0af68.tar.bz2 spack-f813d823a14f25a8f06c2f0bb7ba88db33c0af68.tar.xz spack-f813d823a14f25a8f06c2f0bb7ba88db33c0af68.zip |
Merge branch 'features/optional-deps' into develop
This includes:
- Much better variant support (+debug/-debug)
- Optional dependency support (depends_on(... , when='<condition>')
- New config file format (YAML in ~/.spack)
- New Spec format (YAML in $prefix/.spack/spec.yaml)
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 828fb04e7d..1c6ca4c99e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *~ .DS_Store .idea +/etc/spack/* /etc/spackconfig /share/spack/dotkit /share/spack/modules |