summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-02-03 15:00:18 +0000
committerChef Versioner <chef-versioner@chef.io>2017-02-03 15:00:18 +0000
commit434a7a333ab60c866a107f2a153939c3b0885fa0 (patch)
tree99997de86dc00b2a7ca697a991f0b7e5e91dd70b
parent0eac908c5e766b9efc4f33d551364ad011f27181 (diff)
downloadchef-434a7a333ab60c866a107f2a153939c3b0885fa0.tar.gz
Bump version of chef to 12.19.6 by Chef Versioner.v12.19.6
-rw-r--r--CHANGELOG.md5
-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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e8be90ebc..2e2e402f9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
This changelog reflects the current state of chef's master 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.19.5](https://github.com/chef/chef/tree/v12.19.5) (2017-02-01)
-[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.5)
+## [v12.19.6](https://github.com/chef/chef/tree/v12.19.6) (2017-02-03)
+[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.6)
**Merged pull requests:**
+- Raise error if ips\_package install returns non-zero [\#5773](https://github.com/chef/chef/pull/5773) ([tduffield](https://github.com/tduffield))
- Use CIDR notation rather than netmask in route-eth0 file [\#5772](https://github.com/chef/chef/pull/5772) ([tduffield](https://github.com/tduffield))
- Direct feature requests to feedback.chef.io [\#5759](https://github.com/chef/chef/pull/5759) ([tduffield](https://github.com/tduffield))
- Bump minor version to 12.19 [\#5755](https://github.com/chef/chef/pull/5755) ([scottopherson](https://github.com/scottopherson))
diff --git a/Gemfile.lock b/Gemfile.lock
index dc81e8a45b..2aee3b92ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.19.5)
+ chef (12.19.6)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.5)
+ chef-config (= 12.19.6)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.19.5-universal-mingw32)
+ chef (12.19.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.5)
+ chef-config (= 12.19.6)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.19.5)
+ chef-config (12.19.6)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index b9d9839fa4..6f54db80e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.19.5 \ No newline at end of file
+12.19.6 \ 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 3cd37d79a5..8aed57318b 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.19.5"
+ VERSION = "12.19.6"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4bb8d2dbcd..f336426a29 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.19.5"
+ VERSION = "12.19.6"
end
#