summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2020-01-21 13:53:07 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2020-01-21 17:29:42 -0800
commit3a7dc2359fd833e5f920818f67f6d0474bfb9042 (patch)
tree85022fc32a7b47e3163080a391e811b73f0af617
parent9ecef4c033640e67e742e2395efb934e1e387f2e (diff)
downloadchef-3a7dc2359fd833e5f920818f67f6d0474bfb9042.tar.gz
fix namespacing bugs
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--chef-utils/lib/chef-utils/version_string.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--lib/chef/version_string.rb4
3 files changed, 5 insertions, 3 deletions
diff --git a/chef-utils/lib/chef-utils/version_string.rb b/chef-utils/lib/chef-utils/version_string.rb
index d4843263b8..5b3780e618 100644
--- a/chef-utils/lib/chef-utils/version_string.rb
+++ b/chef-utils/lib/chef-utils/version_string.rb
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-class ChefUtils
+module ChefUtils
# String-like object for version strings.
#
# @since 13.2
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d3e2dd86f8..3f17821fe0 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2010-2018, Chef Software, Inc.
+# Copyright:: Copyright 2010-2020, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/chef/version_string.rb b/lib/chef/version_string.rb
index d02eceacc0..8da5df570a 100644
--- a/lib/chef/version_string.rb
+++ b/lib/chef/version_string.rb
@@ -15,4 +15,6 @@
require "chef-utils/version_string"
-Chef::VersionString == ChefUtils::VersionString
+class Chef
+ VersionString = ChefUtils::VersionString
+end