summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ef0c061c3b..4f7fdcd3f0 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.3](https://github.com/chef/chef/tree/v12.19.3) (2017-01-30)
-[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.3)
+## [v12.19.4](https://github.com/chef/chef/tree/v12.19.4) (2017-02-01)
+[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.4)
**Merged pull requests:**
+- 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))
- Ruby 2.3 doesn't have casecmp?. Use casecmp instead [\#5751](https://github.com/chef/chef/pull/5751) ([tduffield](https://github.com/tduffield))
diff --git a/Gemfile.lock b/Gemfile.lock
index e856b5878f..c53b9af3ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.19.3)
+ chef (12.19.4)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.3)
+ chef-config (= 12.19.4)
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.3-universal-mingw32)
+ chef (12.19.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.3)
+ chef-config (= 12.19.4)
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.3)
+ chef-config (12.19.4)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 38bca5b5b5..4e16007426 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.19.3 \ No newline at end of file
+12.19.4 \ 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 b3afa014c8..fd7e5d9556 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.3"
+ VERSION = "12.19.4"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c627359444..e727be6fa3 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.3"
+ VERSION = "12.19.4"
end
#