summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5323c76c0c..01367732df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 13.6.49 -->
+## [v13.6.49](https://github.com/chef/chef/tree/v13.6.49) (2017-12-19)
#### Merged Pull Requests
+- Fix yum_repository allowing priority of 0 and remove string regexes [#6697](https://github.com/chef/chef/pull/6697) ([tas50](https://github.com/tas50))
- Add descriptions and yard @since comments to all resources [#6696](https://github.com/chef/chef/pull/6696) ([tas50](https://github.com/tas50))
- Cleanup to some of the resource specs [#6692](https://github.com/chef/chef/pull/6692) ([tas50](https://github.com/tas50))
<!-- latest_release -->
@@ -11,6 +12,7 @@
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Fix yum_repository allowing priority of 0 and remove string regexes [#6697](https://github.com/chef/chef/pull/6697) ([tas50](https://github.com/tas50)) <!-- 13.6.49 -->
- Add descriptions and yard @since comments to all resources [#6696](https://github.com/chef/chef/pull/6696) ([tas50](https://github.com/tas50)) <!-- 13.6.48 -->
- Cleanup to some of the resource specs [#6692](https://github.com/chef/chef/pull/6692) ([tas50](https://github.com/tas50)) <!-- 13.6.48 -->
- fix for data bag names partially matching search reserved words [#6652](https://github.com/chef/chef/pull/6652) ([sandratiffin](https://github.com/sandratiffin)) <!-- 13.6.48 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bab207f26d..59668a6721 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.48)
+ chef (13.6.49)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.48)
+ chef-config (= 13.6.49)
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.48-universal-mingw32)
+ chef (13.6.49-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.48)
+ chef-config (= 13.6.49)
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.48)
+ chef-config (13.6.49)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -158,7 +158,7 @@ GEM
gyoku (1.3.1)
builder (>= 2.1.2)
hashdiff (0.3.7)
- hashie (3.5.6)
+ hashie (3.5.7)
highline (1.7.10)
htmlentities (4.3.4)
httpclient (2.8.3)
diff --git a/VERSION b/VERSION
index a42d62da61..e14833735d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.48 \ No newline at end of file
+13.6.49 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 346ef08ef0..ce3b8a2802 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.48"
+ VERSION = "13.6.49"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0950808645..cd0691ca18 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.48")
+ VERSION = Chef::VersionString.new("13.6.49")
end
#