summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMatthew LeGendre <legendre1@llnl.gov>2016-01-25 10:52:17 -0800
committerMatthew LeGendre <legendre1@llnl.gov>2016-01-25 10:52:17 -0800
commitfa888a4ba15176e9d415ffced41f6f16801f1938 (patch)
treef39f431b0bd37f385353c62d0f6ce1a981abff3f /etc
parentfac4428766fb0a6b6cd357b654215f55df1220d4 (diff)
parent04a8439c39e674abb89d7a3f8dea82810c7ca682 (diff)
downloadspack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.gz
spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.bz2
spack-fa888a4ba15176e9d415ffced41f6f16801f1938.tar.xz
spack-fa888a4ba15176e9d415ffced41f6f16801f1938.zip
Merge branch 'develop' into features/external-packages
Conflicts: lib/spack/spack/cmd/mirror.py lib/spack/spack/concretize.py lib/spack/spack/config.py lib/spack/spack/spec.py lib/spack/spack/stage.py var/spack/packages/mvapich2/package.py
Diffstat (limited to 'etc')
-rw-r--r--etc/spack/repos.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/spack/repos.yaml b/etc/spack/repos.yaml
new file mode 100644
index 0000000000..2d4ff54ce6
--- /dev/null
+++ b/etc/spack/repos.yaml
@@ -0,0 +1,8 @@
+# -------------------------------------------------------------------------
+# This is the default spack repository configuration.
+#
+# Changes to this file will affect all users of this spack install,
+# although users can override these settings in their ~/.spack/repos.yaml.
+# -------------------------------------------------------------------------
+repos:
+ - $spack/var/spack/repos/builtin