summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2018-01-02 17:42:33 +0000
committerGitHub <noreply@github.com>2018-01-02 17:42:33 +0000
commit343ae7521fd9167cdb7df46186187f0cd433cc15 (patch)
tree90962afb5f8af9b2c1959906a4e85eb703af71e3
parentc4b81c8e2951067d7458c16343d3ea036c864fb6 (diff)
parente7020f44933e22defb7985764c4471fca27b0992 (diff)
downloadchef-343ae7521fd9167cdb7df46186187f0cd433cc15.tar.gz
Merge pull request #6722 from chef/tm/13_7
bump minor to 13.7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
4 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c9276933f..f239098d1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.57)
+ chef (13.7.0)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.57)
+ chef-config (= 13.7.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.57-universal-mingw32)
+ chef (13.7.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.57)
+ chef-config (= 13.7.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.57)
+ chef-config (13.7.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index da44086c7b..d6ef99820f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.57 \ No newline at end of file
+13.7.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 7b59e45ae8..239d1be4bb 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.6.57"
+ VERSION = "13.7.0"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 836c50a4d4..b17633be1f 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.6.57")
+ VERSION = Chef::VersionString.new("13.7.0")
end
#