From 03eadde04eb219bfa8abe52d312261a5142e7266 Mon Sep 17 00:00:00 2001
From: Lamont Granquist <lamont@scriptkiddie.org>
Date: Fri, 12 Feb 2016 09:32:14 -0800
Subject: pull rubocop 0.37.2 into chefstyle

this is from the same ruleset that we had, but the new code catches more
conditions.
---
 lib/chef/environment.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/chef/environment.rb')

diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index b286dad4e2..9cdb8a8522 100644
--- a/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
@@ -36,7 +36,7 @@ class Chef
 
     attr_accessor :chef_server_rest
 
-    COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:[\s]+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:[\s]+).+)$/.freeze
+    COMBINED_COOKBOOK_CONSTRAINT = /(.+)(?:[\s]+)((?:#{Chef::VersionConstraint::OPS.join('|')})(?:[\s]+).+)$/
 
     def initialize(chef_server_rest: nil)
       @name = ""
@@ -123,7 +123,7 @@ class Chef
       result = {
         "name" => @name,
         "description" => @description,
-        "cookbook_versions" =>  @cookbook_versions,
+        "cookbook_versions" => @cookbook_versions,
         "json_class" => self.class.name,
         "chef_type" => "environment",
         "default_attributes" => @default_attributes,
-- 
cgit v1.2.1