summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-08-25 10:55:00 -0700
committerTim Smith <tsmith@chef.io>2017-08-25 10:55:00 -0700
commit8c30db84a92f995cb6cf6d83f4964dffdd28ad1c (patch)
treeb59f3826013b2948ed865d097012997ca0d60e69
parent16138d69d33d16bd8848038288af88f2a5ccb6df (diff)
downloadchef-8c30db84a92f995cb6cf6d83f4964dffdd28ad1c.tar.gz
Bump version to 13.4.0
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb7
-rw-r--r--lib/chef/version.rb7
4 files changed, 14 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e3a798201f..c8b96d95ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.52)
+ chef (13.4.0)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.52)
+ chef-config (= 13.4.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.3.52-universal-mingw32)
+ chef (13.4.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.52)
+ chef-config (= 13.4.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.3.52)
+ chef-config (13.4.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index cf1b3f0999..74302c5119 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.52 \ No newline at end of file
+13.4.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 1e09643d46..7483524c0d 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -14,13 +14,14 @@
# limitations under the License.
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# NOTE: This file is modified via the `.expeditor/update_version.sh` script, which
-# is triggered automatically by Chef Expeditor when a Pull Request is merged.
+# NOTE: This file is generated by running `rake version` in the top level of
+# this repo. Do not edit this manually. Edit the VERSION file and run the rake
+# task instead.
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.52"
+ VERSION = "13.4.0"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ef89404fe7..ea138018ee 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -14,15 +14,16 @@
# limitations under the License.
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# NOTE: This file is modified via the `.expeditor/update_version.sh` script, which
-# is triggered automatically by Chef Expeditor when a Pull Request is merged.
+# NOTE: This file is generated by running `rake version` in the top level of
+# this repo. Do not edit this manually. Edit the VERSION file and run the rake
+# task instead.
#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.52")
+ VERSION = Chef::VersionString.new("13.4.0")
end
#