From 833b0ac282a4fa43d2cb963c0162605e221833f7 Mon Sep 17 00:00:00 2001 From: alalazo Date: Fri, 15 Jul 2016 11:03:02 +0200 Subject: [PATCH] Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases Conflicts: lib/spack/spack/__init__.py var/spack/repos/builtin/packages/gmp/package.py var/spack/repos/builtin/packages/openjpeg/package.py --- lib/spack/spack/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 795e22186c..abbf3cc87b 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -184,7 +184,7 @@ 'when', 'ver', 'alldeps', - 'nolinks'] + 'nolink'] from spack.package import Package, ExtensionConflictError from spack.package import CMakePackage, AutotoolsPackage, EditableMakefile from spack.version import Version, ver