summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-06-20 14:06:44 +0100
committerThom May <thom@chef.io>2017-06-20 14:06:44 +0100
commitb3dd3de979a2312f8f809bacaaf639d36e4d1bdd (patch)
treecfbf99567b7d09e5abc8d1152a58a34c274d2da0
parentda33997c5caa641764fb7fdfeddfa65151e461c8 (diff)
downloadchef-b3dd3de979a2312f8f809bacaaf639d36e4d1bdd.tar.gz
release 12.21.1v12.21.1
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--CHANGELOG.md6
-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, 14 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d81ced5412..f3db48b931 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
This changelog reflects the current state of chef's 12 branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
+## [v12.21.1](https://github.com/chef/chef/tree/v12.21.1) (2017-06-20)
+[Full Changelog](https://github.com/chef/chef/compare/v12.21.1...v12.21.1)
+
+**Fixed bugs:**
+- Fix tests on SLES 12
+
## [v12.21.0](https://github.com/chef/chef/tree/v12.21.0) (2017-06-19)
[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v12.21.0)
diff --git a/Gemfile.lock b/Gemfile.lock
index 35301c92ed..c85792b28b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,10 +46,10 @@ GIT
PATH
remote: .
specs:
- chef (12.21.0)
+ chef (12.21.1)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.0)
+ chef-config (= 12.21.1)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -75,10 +75,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.21.0-universal-mingw32)
+ chef (12.21.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.21.0)
+ chef-config (= 12.21.1)
chef-zero (>= 4.8, < 13)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -119,7 +119,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.21.0)
+ chef-config (12.21.1)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e68b860383..4469f54082 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.21.0
+12.21.1
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 9d6c17b968..8c9adf32d4 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 = "12.21.0"
+ VERSION = "12.21.1"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6efc64b9e1..77be204d97 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.21.0"
+ VERSION = "12.21.1"
end
#