From 1741279f16ffaae130142d08244c695c98e843a4 Mon Sep 17 00:00:00 2001
From: Peter Josef Scheibel <scheibel1@llnl.gov>
Date: Thu, 9 Jul 2020 16:42:08 -0700
Subject: [PATCH] Bump version to 0.15.1; update CHANGELOG and version
 references

---
 CHANGELOG.md                          | 16 ++++++++++++++++
 lib/spack/spack/__init__.py           |  2 +-
 lib/spack/spack/container/images.json | 12 ++++++++----
 lib/spack/spack/schema/container.py   |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4050f3f9a..b7e4cc0ad3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# v0.15.1 (2020-07-10)
+
+This minor release includes several important fixes:
+
+* Fix shell support on Cray (#17386)
+* Fix use of externals installed with other Spack instances (#16954)
+* Fix gcc+binutils build (#9024)
+* Fixes for usage of intel-mpi (#17378 and #17382)
+* Fixes to Autotools config.guess detection (#17333 and #17356)
+* Update `spack install` message to prompt user when an environment is not
+  explicitly activated (#17454)
+
+This release also adds a mirror for all sources that are
+fetched in Spack (#17077). It is expected to be useful when the
+official website for a Spack package is unavailable.
+
 # v0.15.0 (2020-06-28)
 
 `v0.15.0` is a major feature release.
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 9bcf7c10bb..ceb1e256b1 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, 0)
+spack_version_info = (0, 15, 1)
 
 #: 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 84ae554339..e4761d4b40 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -12,7 +12,8 @@
       "0.14.1": "0.14.1",
       "0.14.2": "0.14.2",
       "0.15": "0.15",
-      "0.15.0": "0.15.0"
+      "0.15.0": "0.15.0",
+      "0.15.1": "0.15.1"
     }
   },
   "ubuntu:16.04": {
@@ -28,7 +29,8 @@
       "0.14.1": "0.14.1",
       "0.14.2": "0.14.2",
       "0.15": "0.15",
-      "0.15.0": "0.15.0"
+      "0.15.0": "0.15.0",
+      "0.15.1": "0.15.1"
     }
   },
   "centos:7": {
@@ -44,7 +46,8 @@
       "0.14.1": "0.14.1",
       "0.14.2": "0.14.2",
       "0.15": "0.15",
-      "0.15.0": "0.15.0"
+      "0.15.0": "0.15.0",
+      "0.15.1": "0.15.1"
     }
   },
   "centos:6": {
@@ -60,7 +63,8 @@
       "0.14.1": "0.14.1",
       "0.14.2": "0.14.2",
       "0.15": "0.15",
-      "0.15.0": "0.15.0"
+      "0.15.0": "0.15.0",
+      "0.15.1": "0.15.1"
     }
   }
 }
diff --git a/lib/spack/spack/schema/container.py b/lib/spack/spack/schema/container.py
index d204014dc6..36cb74a875 100644
--- a/lib/spack/spack/schema/container.py
+++ b/lib/spack/spack/schema/container.py
@@ -32,7 +32,7 @@
                     'enum': [
                         'develop',
                         '0.14', '0.14.0', '0.14.1', '0.14.2',
-                        '0.15', '0.15.0',
+                        '0.15', '0.15.0', '0.15.1',
                     ]
                 }
             },