Merge pull request #521 from 3flex/remove-lint-ignores

don't ignore lint errors
voxpupuli · Dec 10, 2014 · 5c031c3 · 5c031c3
2 parents ba4b67a + 8df2e75
commit 5c031c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -355,7 +355,7 @@
         $content_real,
         template('nginx/vhost/location_footer.erb')
       ], ''),
-      order   => "${priority}", #lint:ignore:only_variable_string waiting on https://github.com/puppetlabs/puppetlabs-concat/commit/f70881fbfd01c404616e9e4139d98dad78d5a918
+      order   => $priority,
     }
   }
 
@@ -372,7 +372,7 @@
         $content_real,
         template('nginx/vhost/location_footer.erb')
       ], ''),
-      order   => "${ssl_priority}", #lint:ignore:only_variable_string waiting on https://github.com/puppetlabs/puppetlabs-concat/commit/f70881fbfd01c404616e9e4139d98dad78d5a918
+      order   => $ssl_priority,
     }
   }
 

diff --git a/metadata.json b/metadata.json
@@ -11,6 +11,6 @@
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 3.0.0 <5.0.0"},
     {"name":"puppetlabs/apt","version_requirement":">= 1.0.0 <2.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <2.0.0"}
+    {"name":"puppetlabs/concat","version_requirement":">= 1.1.1 <2.0.0"}
   ]
 }