summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-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
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e2327d85..5d798bbe95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.46 -->
-## [v14.6.46](https://github.com/chef/chef/tree/v14.6.46) (2018-10-25)
+<!-- latest_release 14.6.47 -->
+## [v14.6.47](https://github.com/chef/chef/tree/v14.6.47) (2018-10-25)
#### Merged Pull Requests
-- Pin rake to 12.3.0 to prevent installing 2 copies in our install [#7779](https://github.com/chef/chef/pull/7779) ([tas50](https://github.com/tas50))
+- Fix locale on RHEL 6 / Amazon Linux [#7782](https://github.com/chef/chef/pull/7782) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Fix locale on RHEL 6 / Amazon Linux [#7782](https://github.com/chef/chef/pull/7782) ([tas50](https://github.com/tas50)) <!-- 14.6.47 -->
- Pin rake to 12.3.0 to prevent installing 2 copies in our install [#7779](https://github.com/chef/chef/pull/7779) ([tas50](https://github.com/tas50)) <!-- 14.6.46 -->
- Add some retry/delay in HTTP functional tests [#7780](https://github.com/chef/chef/pull/7780) ([schisamo](https://github.com/schisamo)) <!-- 14.6.45 -->
- Move iso8601 gem to windows only gemspec [#7778](https://github.com/chef/chef/pull/7778) ([tas50](https://github.com/tas50)) <!-- 14.6.44 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 261ed5dde7..acc32e0fe9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.46)
+ chef (14.6.47)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.46)
+ chef-config (= 14.6.47)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.46-universal-mingw32)
+ chef (14.6.47-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.46)
+ chef-config (= 14.6.47)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -85,7 +85,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.46)
+ chef-config (14.6.47)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 8f46258e30..0cec8c78dd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.46 \ No newline at end of file
+14.6.47 \ 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 cc86f008c0..2da9c1a5f7 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.6.46".freeze
+ VERSION = "14.6.47".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d561e220b9..0e8cf397eb 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.6.46")
+ VERSION = Chef::VersionString.new("14.6.47")
end
#