summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-07-16 11:53:00 -0700
committerTim Smith <tsmith@chef.io>2018-07-16 11:53:00 -0700
commite438b34b96253ffd5be53649d4b2f41f9114b790 (patch)
tree219fd2a2789d069ea01043c92df9eba5d45795ae
parent8f5f1cea9116cb3e99c3d523ffb8e945406ab731 (diff)
downloadchef-e438b34b96253ffd5be53649d4b2f41f9114b790.tar.gz
Bump version to 14.4.0bump_144
It's time to start merging new features. 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/package_task.rb4
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d84bb6711a..03281ef3e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.3.46)
+ chef (14.4.0)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.46)
+ chef-config (= 14.4.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.3.46-universal-mingw32)
+ chef (14.4.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.3.46)
+ chef-config (= 14.4.0)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.3.46)
+ chef-config (14.4.0)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index f07ed14c6a..72f51351fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.3.46 \ No newline at end of file
+14.4.0
diff --git a/chef-config/lib/chef-config/package_task.rb b/chef-config/lib/chef-config/package_task.rb
index ae5acef258..e44ec71508 100644
--- a/chef-config/lib/chef-config/package_task.rb
+++ b/chef-config/lib/chef-config/package_task.rb
@@ -217,11 +217,11 @@ module ChefConfig
# See the License for the specific language governing permissions and
# limitations under the License.
- #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# 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.
- #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#{"\nrequire \"chef/version_string\"\n" if use_versionstring}
#{class_or_module} #{module_name}
#{module_name.upcase}_ROOT = File.expand_path("../..", __FILE__)
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0bfb89e493..a987882cf8 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 = "14.3.46".freeze
+ VERSION = "14.4.0".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a5cadfb4a0..2651ec78ed 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("14.3.46")
+ VERSION = Chef::VersionString.new("14.4.0")
end
#