summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* immutablize on the fly and reduce dupinglcg/backport-6362Lamont Granquist2017-09-013-25/+100
| | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version to 12.21.8 by Chef Expeditorv12.21.8Chef Expeditor2017-09-014-8/+8
|
* Merge pull request #6376 from chef/lcg/chef-12-readline-depLamont Granquist2017-09-011-1/+1
|\ | | | | bump rb-readline
| * bump rb-readlinelcg/chef-12-readline-depLamont Granquist2017-09-011-1/+1
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version to 12.21.7 by Chef Expeditorv12.21.7Chef Expeditor2017-08-294-8/+8
|
* Merge pull request #6366 from chef/lcg/bump-rubygems-chef-12Lamont Granquist2017-08-291-1/+1
|\ | | | | backport to chef-12: bump rubygems to 2.6.13
| * backport to chef-12: bump rubygems to 2.6.13lcg/bump-rubygems-chef-12Lamont Granquist2017-08-291-1/+1
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version to 12.21.6 by Chef Expeditorv12.21.6Chef Expeditor2017-08-294-8/+8
|
* Merge pull request #6358 from chef/lcg/backport-6356Lamont Granquist2017-08-281-4/+0
|\ | | | | Chef-12: backport 6356
| * node attributes: remove useless dup in merge_alllcg/backport-6356Lamont Granquist2017-08-281-4/+0
| | | | | | | | | | | | | | | | | | since immutablize now does dup + freeze of everything this is definitively unnecessary, and appears to have been unnecessary even in Chef-12 (at last does not break any specs there either). Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Bump version to 12.21.5 by Chef Expeditorv12.21.5Chef Expeditor2017-08-295-9/+9
| |
* | Merge pull request #6357 from chef/lcg/backport-6355Lamont Granquist2017-08-282-5/+13
|\ \ | |/ |/| backport 6355 to Chef-12
| * missing spec fixlcg/backport-6355Lamont Granquist2017-08-281-1/+1
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * speed up immutabilizationLamont Granquist2017-08-282-4/+12
|/ | | | | | since we only inject Mash/VividMashes do not convert Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Update Changelog for v12.21.4 buildBryan McLellan2017-08-151-1/+11
| | | | Signed-off-by: Bryan McLellan <btm@loftninjas.org>
* Bump version to 12.21.4 by Chef Expeditorv12.21.4Chef Expeditor2017-08-145-9/+9
|
* Merge pull request #6333 from chef/tduffield/work-around-bugTom Duffield2017-08-141-3/+8
|\ | | | | Fix up update_version to work around bundler bug
| * Fix up update_version to work around bundler bugtduffield/work-around-bugTom Duffield2017-08-141-3/+8
|/ | | | Signed-off-by: Tom Duffield <tom@chef.io>
* Update Gemfile.lock without attempting to install GemsTom Duffield2017-08-142-3/+1
| | | | Signed-off-by: Tom Duffield <tom@chef.io>
* Add Expeditor to chef-12 branchTom Duffield2017-08-133-0/+104
| | | | Signed-off-by: Tom Duffield <tom@chef.io>
* Don't `gem uninstall bundler` in TravisBryan McLellan2017-08-131-2/+0
| | | | | | | Some of the Travis tests fail here if bundler isn't present. These lines were removed in master along with Ruby upgrades. Signed-off-by: Bryan McLellan <btm@loftninjas.org>
* Update SHA1 fingerprint for MSI signing certSeth Chisamore2017-08-131-2/+2
| | | | | | The cert has been updated as the old one expires on 2017-07-25. Signed-off-by: Seth Chisamore <schisamo@chef.io>
* Use Ruby 2.3.4 (latest 2.3) with GCC 7 PatchBryan McLellan2017-08-132-3/+3
| | | | | | Our Windows infrastructure uses GCC 7 now, so we need to patch 2.3 until 2.3.5 is released. Signed-off-by: Bryan McLellan <btm@loftninjas.org>
* made changes to work file and remote_file resource work for lazyNAshwini2017-08-082-4/+177
| | | | Signed-off-by: NAshwini <ashwini.nehate@msystechnologies.com>
* Merge pull request #6290 from chef/jsinha/BEN-180-chef-12Thom May2017-07-314-22/+22
|\ | | | | [BEN-180] Rename resource template in chef-12 and update omnibus
| * Update libiconv versionjsinha/BEN-180-chef-12Jaymala Sinha2017-07-312-2/+2
| | | | | | | | Signed-off-by: Jaymala Sinha <jsinha@chef.io>
| * Revert bundler versionJaymala Sinha2017-07-281-2/+2
| | | | | | | | Signed-off-by: Jaymala Sinha <jsinha@chef.io>
| * Update omnibus-softwareJaymala Sinha2017-07-281-7/+7
| | | | | | | | Signed-off-by: Jaymala Sinha <jsinha@chef.io>
| * [BEN-180] Rename resource template in chef-12 and update omnibusJaymala Sinha2017-07-252-21/+21
|/ | | | Signed-off-by: Jaymala Sinha <jsinha@chef.io>
* release 12.21.3v12.21.312.21.3Bryan McLellan2017-06-235-9/+21
| | | | Signed-off-by: Bryan McLellan <btm@chef.io>
* Properly send run_list_expanded event in policy node caseTyler Cloke2017-06-232-1/+77
| | | | Signed-off-by: Tyler Cloke <tylercloke@gmail.com>
* Bump version of chef to 12.21.2v12.21.2Thom May2017-06-214-8/+8
| | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #6231 from chef/tm/chefstyle_0_5Thom May2017-06-214-12/+10
|\ | | | | lock chefstyle at 0.5
| * lock chefstyle at 0.5tm/chefstyle_0_5Thom May2017-06-214-12/+10
| | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | release 12.21.1v12.21.1Thom May2017-06-205-8/+14
| | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | Looks like this is broken on SLES 12.0/x64 tooThom May2017-06-201-1/+1
|/ | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #6226 from chef/tm/12_21v12.21.0Thom May2017-06-2010-113/+171
|\ | | | | Release 12.21.0
| * Release 12.21.0tm/12_21Thom May2017-06-2010-113/+171
| | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | Merge pull request #6227 from chef/tm/backport_2016_fixesThom May2017-06-204-17/+46
|\ \ | |/ |/| Backport Windows 2016 test fixes
| * Fixed the specs and review commentstm/backport_2016_fixesNimishaS2017-06-204-21/+27
| | | | | | | | Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
| * Fixing build failures of Windows Server 2016nimisha2017-06-204-4/+27
|/ | | | Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
* Merge pull request #6224 from chef/tm/backport_acceptance_timeoutThom May2017-06-191-0/+1
|\ | | | | bump acceptance provisioning timeout to 10 minutes
| * bump acceptance provisioning timeout to 10 minutestm/backport_acceptance_timeoutThom May2017-06-191-0/+1
|/ | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #6219 from chef/tm/bump_zlib_12Thom May2017-06-192-18/+18
|\ | | | | bump zlib to 1.2.11
| * bump zlib to 1.2.11tm/bump_zlib_12Thom May2017-06-162-18/+18
| | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | Merge pull request #6222 from coderanger/supports-exceptionNoah Kantrowitz2017-06-161-0/+4
|\ \ | | | | | | Special case for the supports pseudo-property for Chef 12.
| * | Special case for the supports pseudo-property for Chef 12.Noah Kantrowitz2017-06-161-0/+4
| |/ | | | | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
* | Trying to update the Travis branch config so 12.x backport PRs will get tested.Noah Kantrowitz2017-06-161-1/+1
|/ | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
* Merge pull request #6173 from coderanger/error-for-12Noah Kantrowitz2017-05-302-8/+70
|\ | | | | Backport error info for Chef 12
| * Chefstyle fixes.Noah Kantrowitz2017-05-242-7/+6
| | | | | | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>