Merge branch 'develop' into mplegendre-multi_pkgsrc_roots
Conflicts: lib/spack/spack/__init__.py lib/spack/spack/directives.py lib/spack/spack/packages.py
Showing
- README.md 6 additions, 18 deletionsREADME.md
- bin/spack 1 addition, 1 deletionbin/spack
- lib/spack/docs/conf.py 3 additions, 3 deletionslib/spack/docs/conf.py
- lib/spack/llnl/util/filesystem.py 1 addition, 1 deletionlib/spack/llnl/util/filesystem.py
- lib/spack/llnl/util/lang.py 1 addition, 4 deletionslib/spack/llnl/util/lang.py
- lib/spack/llnl/util/lock.py 175 additions, 0 deletionslib/spack/llnl/util/lock.py
- lib/spack/llnl/util/tty/colify.py 4 additions, 14 deletionslib/spack/llnl/util/tty/colify.py
- lib/spack/llnl/util/tty/color.py 5 additions, 0 deletionslib/spack/llnl/util/tty/color.py
- lib/spack/spack/__init__.py 14 additions, 6 deletionslib/spack/spack/__init__.py
- lib/spack/spack/architecture.py 8 additions, 11 deletionslib/spack/spack/architecture.py
- lib/spack/spack/build_environment.py 6 additions, 1 deletionlib/spack/spack/build_environment.py
- lib/spack/spack/cmd/__init__.py 1 addition, 1 deletionlib/spack/spack/cmd/__init__.py
- lib/spack/spack/cmd/deactivate.py 1 addition, 1 deletionlib/spack/spack/cmd/deactivate.py
- lib/spack/spack/cmd/diy.py 29 additions, 27 deletionslib/spack/spack/cmd/diy.py
- lib/spack/spack/cmd/extensions.py 1 addition, 1 deletionlib/spack/spack/cmd/extensions.py
- lib/spack/spack/cmd/find.py 23 additions, 2 deletionslib/spack/spack/cmd/find.py
- lib/spack/spack/cmd/info.py 13 additions, 3 deletionslib/spack/spack/cmd/info.py
- lib/spack/spack/cmd/install.py 8 additions, 7 deletionslib/spack/spack/cmd/install.py
- lib/spack/spack/cmd/module.py 2 additions, 2 deletionslib/spack/spack/cmd/module.py
- lib/spack/spack/cmd/reindex.py 31 additions, 0 deletionslib/spack/spack/cmd/reindex.py
Loading
Please register or sign in to comment