bump version number to v0.14.3

2020-07-10 17:04:38 -07:00
parent ddc79ce4df
commit 93bd27dc19
2 changed files with 1 additions and 5 deletions
--- 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, 14, 2)
+spack_version_info = (0, 14, 3)

 #: String containing Spack version joined with .'s
 spack_version = '.'.join(str(v) for v in spack_version_info)
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -53,14 +53,10 @@
    "build_tags": {
      "develop": "latest",
      "0.14": "0.14",
-<<<<<<< HEAD
-      "0.14.0": "0.14.0"
-=======
      "0.14.0": "0.14.0",
      "0.14.1": "0.14.1",
      "0.14.2": "0.14.2",
      "0.14.3": "0.14.3"
->>>>>>> 8f208b17e2... spack containerize: allow 0.14.3 tag for next release
    }
  }
 }