initial merging on release tags

1 files changed, 60 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6846ff5fd3..61511251df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,65 @@
 # Change Log
 
+## [v12.11.18](https://github.com/chef/chef/tree/v12.11.18) (2016-06-02)
+[Full Changelog](https://github.com/chef/chef/compare/v12.11.17...v12.11.18)
+
+**Merged pull requests:**
+
+- Add set -evx to shell scripts [\#4989](https://github.com/chef/chef/pull/4989) ([jkeiser](https://github.com/jkeiser))
+- Creation of the new DataCollector reporter [\#4973](https://github.com/chef/chef/pull/4973) ([adamleff](https://github.com/adamleff))
+- adding shell scripts for the bump bot that will ensure the correct bundler version is installed [\#4986](https://github.com/chef/chef/pull/4986) ([mwrock](https://github.com/mwrock))
+- Fix \#4949 and Avoid Errno::EBUSY on docker containers [\#4979](https://github.com/chef/chef/pull/4979) ([andrewjamesbrown](https://github.com/andrewjamesbrown))
+- update dependencies [\#4976](https://github.com/chef/chef/pull/4976) ([mwrock](https://github.com/mwrock))
+- Ensure recipe-url works right in solo [\#4957](https://github.com/chef/chef/pull/4957) ([thommay](https://github.com/thommay))
+- DOC\_CHANGES for RFC 062 Exit Status behavior [\#4971](https://github.com/chef/chef/pull/4971) ([smurawski](https://github.com/smurawski))
+- add systemd\_unit try-restart, reload-or-restart, reload-or-try-restart actions [\#4908](https://github.com/chef/chef/pull/4908) ([nathwill](https://github.com/nathwill))
+- Fix portage provider to support version with character [\#4966](https://github.com/chef/chef/pull/4966) ([crigor](https://github.com/crigor))
+- fixes \#4968 and only retrieves the latest version of packages from chocolatey [\#4977](https://github.com/chef/chef/pull/4977) ([mwrock](https://github.com/mwrock))
+- Update .mailmap with a few more entries [\#4958](https://github.com/chef/chef/pull/4958) ([stevendanna](https://github.com/stevendanna))
+- add a few more distros to kitchen testing [\#4967](https://github.com/chef/chef/pull/4967) ([lamont-granquist](https://github.com/lamont-granquist))
+- fix delete in bundle-platform [\#4970](https://github.com/chef/chef/pull/4970) ([mwrock](https://github.com/mwrock))
+- fix bundle locking on bundler 1.12 [\#4965](https://github.com/chef/chef/pull/4965) ([mwrock](https://github.com/mwrock))
+- Opscode -\> Chef and remove old roadmap items [\#4961](https://github.com/chef/chef/pull/4961) ([tas50](https://github.com/tas50))
+- Remove old webhooks from Travis [\#4960](https://github.com/chef/chef/pull/4960) ([tas50](https://github.com/tas50))
+- convert kitchen tests to docker + other fixes [\#4928](https://github.com/chef/chef/pull/4928) ([lamont-granquist](https://github.com/lamont-granquist))
+- break yum classes out into files [\#4901](https://github.com/chef/chef/pull/4901) ([lamont-granquist](https://github.com/lamont-granquist))
+- RFC062 exit status chef client [\#4611](https://github.com/chef/chef/pull/4611) ([smurawski](https://github.com/smurawski))
+- Update contributing doc to better reflect reality [\#4962](https://github.com/chef/chef/pull/4962) ([tas50](https://github.com/tas50))
+- update readme regarding minor version bump [\#4953](https://github.com/chef/chef/pull/4953) ([mwrock](https://github.com/mwrock))
+- Updating version after Chef 12.10 release [\#4952](https://github.com/chef/chef/pull/4952) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
+- Correct Gemfile.lock [\#4951](https://github.com/chef/chef/pull/4951) ([jkeiser](https://github.com/jkeiser))
+- create 'universal' DSL [\#4942](https://github.com/chef/chef/pull/4942) ([lamont-granquist](https://github.com/lamont-granquist))
+- Add licenses to all software defs [\#4940](https://github.com/chef/chef/pull/4940) ([jkeiser](https://github.com/jkeiser))
+- Handle numeric id for the user value in the git resource [\#4902](https://github.com/chef/chef/pull/4902) ([MichaelPereira](https://github.com/MichaelPereira))
+- With acceptance [\#4950](https://github.com/chef/chef/pull/4950) ([mwrock](https://github.com/mwrock))
+- Re-enable and fix acceptance tests [\#4947](https://github.com/chef/chef/pull/4947) ([schisamo](https://github.com/schisamo))
+- exit 0 -- its how acceptance works [\#4945](https://github.com/chef/chef/pull/4945) ([mwrock](https://github.com/mwrock))
+- update omnibus dependency with appx fix [\#4941](https://github.com/chef/chef/pull/4941) ([mwrock](https://github.com/mwrock))
+- Update changelog for 12.10.24 release [\#4927](https://github.com/chef/chef/pull/4927) ([PrajaktaPurohit](https://github.com/PrajaktaPurohit))
+- Load cookbook versions correctly for knife [\#4936](https://github.com/chef/chef/pull/4936) ([thommay](https://github.com/thommay))
+- RFC 31 - Default solo to local mode [\#4919](https://github.com/chef/chef/pull/4919) ([thommay](https://github.com/thommay))
+- wire up chef handlers directly from libraries [\#4933](https://github.com/chef/chef/pull/4933) ([lamont-granquist](https://github.com/lamont-granquist))
+- reject malformed ini content in systemd\_unit resource [\#4907](https://github.com/chef/chef/pull/4907) ([nathwill](https://github.com/nathwill))
+- Execute chef-acceptance without elevated privileges [\#4932](https://github.com/chef/chef/pull/4932) ([schisamo](https://github.com/schisamo))
+- add appx block with signing key to omnibus project [\#4931](https://github.com/chef/chef/pull/4931) ([mwrock](https://github.com/mwrock))
+- Disable Docker cookbook acceptance tests until the cookbook or Chef is fixed [\#4923](https://github.com/chef/chef/pull/4923) ([adamedx](https://github.com/adamedx))
+- gem metadata command needs Gem.clear\_paths [\#4929](https://github.com/chef/chef/pull/4929) ([lamont-granquist](https://github.com/lamont-granquist))
+- fix os x profile provider for nil [\#4921](https://github.com/chef/chef/pull/4921) ([achand](https://github.com/achand))
+- Update usage of @new\_resource.destination to `cwd` within the git hwrp [\#4898](https://github.com/chef/chef/pull/4898) ([joshburt](https://github.com/joshburt))
+- cookbook site install : tar error on windows [\#4867](https://github.com/chef/chef/pull/4867) ([willoucom](https://github.com/willoucom))
+- fix yum\_package breakage \(the =~ operator in ruby is awful\) [\#4912](https://github.com/chef/chef/pull/4912) ([lamont-granquist](https://github.com/lamont-granquist))
+- Encode registry enumerated values and keys to utf8 instead of the local codepage [\#4906](https://github.com/chef/chef/pull/4906) ([mwrock](https://github.com/mwrock))
+- Chocolatey Package Provider chomps nil object [\#4760](https://github.com/chef/chef/pull/4760) ([svmastersamurai](https://github.com/svmastersamurai))
+- Make apt package provider use\_multipackage\_api aware [\#4888](https://github.com/chef/chef/pull/4888) ([lamont-granquist](https://github.com/lamont-granquist))
+- Support Ruby Files in ChefFS [\#4887](https://github.com/chef/chef/pull/4887) ([thommay](https://github.com/thommay))
+- Adds a system check for fips enablement and runs in fips mode if enabled [\#4880](https://github.com/chef/chef/pull/4880) ([mwrock](https://github.com/mwrock))
+- Lazy'ing candidate\_version in package provider [\#4869](https://github.com/chef/chef/pull/4869) ([lamont-granquist](https://github.com/lamont-granquist))
+- Consolidate shell\_out usage when calling git within it's HWRP. [\#4873](https://github.com/chef/chef/pull/4873) ([joshburt](https://github.com/joshburt))
+- fixes knife ssl check on windows [\#4886](https://github.com/chef/chef/pull/4886) ([mwrock](https://github.com/mwrock))
+- add tests for ChefFS path formatting [\#4871](https://github.com/chef/chef/pull/4871) ([thommay](https://github.com/thommay))
+- add systemd\_unit resource [\#4700](https://github.com/chef/chef/pull/4700) ([nathwill](https://github.com/nathwill))
+- Bump chef-zero to avoid aggressive logging [\#4878](https://github.com/chef/chef/pull/4878) ([stevendanna](https://github.com/stevendanna))
+
 ## [v12.10.24](https://github.com/chef/chef/tree/v12.10.24) (2016-04-27)
 [Full Changelog](https://github.com/chef/chef/compare/v12.10.23...v12.10.24)