From b192011addad8e62ea1fdbdc4039887d0df6db4d Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Wed, 8 Feb 2017 13:12:10 -0800
Subject: [PATCH 1/4] Revert "db and concretization of packages modified after
 installation: fixes #2911" (#3078)

---
 lib/spack/spack/database.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py
index 01d545de6d1..d3fc03fb40f 100644
--- a/lib/spack/spack/database.py
+++ b/lib/spack/spack/database.py
@@ -340,7 +340,6 @@ def invalid_record(hash_key, error):
         # cached prematurely.
         for hash_key, rec in data.items():
             rec.spec._mark_concrete()
-            rec.spec.package.spec._mark_concrete()
 
         self._data = data
 

From c91d18b6223b006c75d41e10509a7f34a5b03346 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@googlemail.com>
Date: Thu, 9 Feb 2017 17:31:57 +0100
Subject: [PATCH 2/4] qa: adjust thresholds for acceptance (#3105)

---
 .codecov.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.codecov.yml b/.codecov.yml
index 52e4b38d9ce..1782e78ff9b 100644
--- a/.codecov.yml
+++ b/.codecov.yml
@@ -4,13 +4,17 @@ coverage:
   range: 60...90
   status:
     project:
+      default: true
       llnl:
+        threshold: 0.5
         paths:
           - lib/spack/llnl
       commands:
+        threshold: 0.5
         paths:
           - lib/spack/spack/cmd
       core:
+        threshold: 0.5
         paths:
           - "!lib/spack/llnl"
           - "!lib/spack/spack/cmd"

From 2a3228e0049b765aaeb0495e429fc6057b5b7cc2 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Thu, 9 Feb 2017 10:33:01 -0600
Subject: [PATCH 3/4] Add latest version of NCO (#3080)

---
 var/spack/repos/builtin/packages/nco/package.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py
index acd96f5e9c8..0f96cf403c1 100644
--- a/var/spack/repos/builtin/packages/nco/package.py
+++ b/var/spack/repos/builtin/packages/nco/package.py
@@ -30,8 +30,9 @@ class Nco(AutotoolsPackage):
     netCDF-accessible formats"""
 
     homepage = "http://nco.sourceforge.net/"
-    url      = "https://github.com/nco/nco/archive/4.6.2.tar.gz"
+    url      = "https://github.com/nco/nco/archive/4.6.4.tar.gz"
 
+    version('4.6.4', '22f4e779d0011a9c0db90fda416c8e45')
     version('4.6.3', '0e1d6616c65ed3a30c54cc776da4f987')
     version('4.6.2', 'b7471acf0cc100343392f4171fb56113')
     version('4.6.1', 'ef43cc989229c2790a9094bd84728fd8')

From 8d7bcbbbbb307ea72596bdcf1374d87d063daf5f Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Thu, 9 Feb 2017 12:38:08 -0600
Subject: [PATCH 4/4] Add latest version of GNU Parallel (#3106)

---
 var/spack/repos/builtin/packages/parallel/package.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/var/spack/repos/builtin/packages/parallel/package.py b/var/spack/repos/builtin/packages/parallel/package.py
index 4297e8acb01..32c3b3f5cdb 100644
--- a/var/spack/repos/builtin/packages/parallel/package.py
+++ b/var/spack/repos/builtin/packages/parallel/package.py
@@ -32,7 +32,12 @@ class Parallel(AutotoolsPackage):
     """
 
     homepage = "http://www.gnu.org/software/parallel/"
-    url      = "http://ftp.gnu.org/gnu/parallel/parallel-20160422.tar.bz2"
+    url      = "http://ftp.gnu.org/gnu/parallel/parallel-20170122.tar.bz2"
 
+    version('20170122', 'c9f0ec01463dc75dbbf292fd8be5f1eb')
     version('20160422', '24621f684130472694333709bd4454cb')
     version('20160322', '4e81e0d36902ab4c4e969ee6f35e6e57')
+
+    def check(self):
+        # The Makefile has a 'test' target, but it does not work
+        make('check')