summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Christopherson <scott@scott-christopherson.com>2017-01-25 10:22:24 -0500
committerGitHub <noreply@github.com>2017-01-25 10:22:24 -0500
commit4180e23a45de99ef91afc41c63794a7de0fb5607 (patch)
tree491d148389459f9dfed70cb437f7920bb8e31b56
parent7eb25ecc82dd4737c3397c5fa421ee909a969725 (diff)
parent1fedf3350cb74739f471680f098d6657da1889bf (diff)
downloadchef-4180e23a45de99ef91afc41c63794a7de0fb5607.tar.gz
Merge pull request #5755 from chef/12.19-bump
Bump minor version to 12.19
-rw-r--r--Gemfile.lock12
-rw-r--r--HISTORY.md26
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 35 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 54db098578..647102a78e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 6309e94fe200090acbde23e5ab70bdcbf8f31410
+ revision: 96c04f9941f96c8be993b7103a0deb221f054120
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.18.53)
+ chef (12.19.0)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.53)
+ chef-config (= 12.19.0)
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.18.53-universal-mingw32)
+ chef (12.19.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.53)
+ chef-config (= 12.19.0)
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.18.53)
+ chef-config (12.19.0)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/HISTORY.md b/HISTORY.md
index 9313404448..acce953a47 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,29 @@
+## [v12.18.31](https://github.com/chef/chef/tree/v12.18.31) (2017-01-11)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.31)
+
+**Implemented enhancements:**
+
+- yum\_repository: Allow baseurl to be an array & allow fastestmirror\_enabled false [\#5708](https://github.com/chef/chef/pull/5708) ([tas50](https://github.com/tas50))
+- Adding returns property to chocolatey\_package resource [\#5688](https://github.com/chef/chef/pull/5688) ([Vasu1105](https://github.com/Vasu1105))
+- Code cleanup in the user provider [\#5674](https://github.com/chef/chef/pull/5674) ([lamont-granquist](https://github.com/lamont-granquist))
+- Code cleanup in the group provider [\#5673](https://github.com/chef/chef/pull/5673) ([lamont-granquist](https://github.com/lamont-granquist))
+- Core: Formally deprecate run\_command [\#5666](https://github.com/chef/chef/pull/5666) ([lamont-granquist](https://github.com/lamont-granquist))
+- Set MSI Scheduled Task name to match chef-client cookbook managed name [\#5657](https://github.com/chef/chef/pull/5657) ([mwrock](https://github.com/mwrock))
+- remove Chef::Platform::HandlerMap [\#5636](https://github.com/chef/chef/pull/5636) ([lamont-granquist](https://github.com/lamont-granquist))
+- Core: Properly deprecate old Chef::Platform methods [\#5631](https://github.com/chef/chef/pull/5631) ([lamont-granquist](https://github.com/lamont-granquist))
+
+**Fixed bugs:**
+
+- Fix error thrown by solo when run on Windows as SYSTEM [\#5693](https://github.com/chef/chef/pull/5693) ([scottopherson](https://github.com/scottopherson))
+- Report a blank resource if sensitive is enabled [\#5668](https://github.com/chef/chef/pull/5668) ([afiune](https://github.com/afiune))
+- Ensure node.docker? returns boolean [\#5645](https://github.com/chef/chef/pull/5645) ([andrewjamesbrown](https://github.com/andrewjamesbrown))
+- Fix Data Collector organization parsing regex [\#5630](https://github.com/chef/chef/pull/5630) ([adamleff](https://github.com/adamleff))
+- Core: Use object ID when detected unprocessed Resources [\#5604](https://github.com/chef/chef/pull/5604) ([adamleff](https://github.com/adamleff))
+
+**Merged pull requests:**
+
+- Core: fix node attribute "unless" API methods [\#5717](https://github.com/chef/chef/pull/5717) ([lamont-granquist](https://github.com/lamont-granquist))
+
## [v12.17.44](https://github.com/chef/chef/tree/v12.17.44) (2016-12-07)
[Full Changelog](https://github.com/chef/chef/compare/v12.16.42...v12.17.44)
diff --git a/VERSION b/VERSION
index 71d71d5a7d..260a0e20f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.53 \ No newline at end of file
+12.19.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 24fa554b9e..8e1aa77f4a 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.18.53"
+ VERSION = "12.19.0"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2bacb551ed..6c66fa7514 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.18.53"
+ VERSION = "12.19.0"
end
#