summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2020-08-13 07:23:02 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2020-08-13 07:23:02 -0700
commitb476f8aa63d48f4b959522ece0406caa32992d4a (patch)
tree1a7c44d74b0f6a6aa637c7fc4ec7dbc33cfc949a /lib
parentecf4829de7b9683a680176e9dff85ba11c0f03d9 (diff)
parent764cafc1ceeda30724c368edef3fe5a1d82275c1 (diff)
downloadspack-b476f8aa63d48f4b959522ece0406caa32992d4a.tar.gz
spack-b476f8aa63d48f4b959522ece0406caa32992d4a.tar.bz2
spack-b476f8aa63d48f4b959522ece0406caa32992d4a.tar.xz
spack-b476f8aa63d48f4b959522ece0406caa32992d4a.zip
Merge tag 'v0.15.4' into develop
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/__init__.py2
-rw-r--r--lib/spack/spack/container/images.json12
-rw-r--r--lib/spack/spack/schema/container.py2
3 files changed, 10 insertions, 6 deletions
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 862c8baa60..da5dd3b3f3 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -5,7 +5,7 @@
#: major, minor, patch version for Spack, in a tuple
-spack_version_info = (0, 15, 3)
+spack_version_info = (0, 15, 4)
#: String containing Spack version joined with .'s
spack_version = '.'.join(str(v) for v in spack_version_info)
diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json
index 24271e0721..b08cbc90a4 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -15,7 +15,8 @@
"0.15.0": "0.15.0",
"0.15.1": "0.15.1",
"0.15.2": "0.15.2",
- "0.15.3": "0.15.3"
+ "0.15.3": "0.15.3",
+ "0.15.4": "0.15.4"
}
},
"ubuntu:16.04": {
@@ -34,7 +35,8 @@
"0.15.0": "0.15.0",
"0.15.1": "0.15.1",
"0.15.2": "0.15.2",
- "0.15.3": "0.15.3"
+ "0.15.3": "0.15.3",
+ "0.15.4": "0.15.4"
}
},
"centos:7": {
@@ -53,7 +55,8 @@
"0.15.0": "0.15.0",
"0.15.1": "0.15.1",
"0.15.2": "0.15.2",
- "0.15.3": "0.15.3"
+ "0.15.3": "0.15.3",
+ "0.15.4": "0.15.4"
}
},
"centos:6": {
@@ -72,7 +75,8 @@
"0.15.0": "0.15.0",
"0.15.1": "0.15.1",
"0.15.2": "0.15.2",
- "0.15.3": "0.15.3"
+ "0.15.3": "0.15.3",
+ "0.15.4": "0.15.4"
}
}
}
diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py
index c6e54732e6..83e04788a0 100644
--- a/lib/spack/spack/schema/container.py
+++ b/lib/spack/spack/schema/container.py
@@ -33,7 +33,7 @@ container_schema = {
'develop',
'0.14', '0.14.0', '0.14.1', '0.14.2',
'0.15', '0.15.0', '0.15.1', '0.15.2',
- '0.15.3',
+ '0.15.3', '0.15.4',
]
}
},