Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use double quotes by default | Thom May | 2016-01-14 | 1292 | -13080/+13082 |
| | | | | | | | This is an entirely mechanically generated (chefstyle -a) change, to go along with chef/chefstyle#5 . We should pick something and use it consistently, and my opinion is that double quotes are the appropriate thing. | ||||
* | Merge pull request #4398 from chef/lcg/trailing_comma | Thom May | 2016-01-14 | 244 | -1106/+1106 |
|\ | | | | | autocorrecting Style/TrailingComma | ||||
| * | autocorrecting Style/TrailingCommalcg/trailing_comma | Lamont Granquist | 2016-01-13 | 244 | -1106/+1106 |
| | | | | | | | | chefstyle -a fixed 1044 occurrances | ||||
* | | Merge pull request #4402 from chef/jr/PR-4399-CHANGELOG | Jordan Running | 2016-01-13 | 1 | -0/+1 |
|\ \ | | | | | | | Changelog for PR#4399 | ||||
| * | | Changelog for PR#4399 | Jordan Running | 2016-01-13 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #4399 from chef/jr/knife-node-edit-save-policy_name-group | Jordan Running | 2016-01-13 | 2 | -35/+267 |
|\ \ | | | | | | | Correctly save policy_name and policy_group with `knife node edit` | ||||
| * | | Correctly save policy_name and policy_group with `knife node edit`jr/knife-node-edit-save-policy_name-group | Jordan Running | 2016-01-13 | 2 | -35/+267 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4364 - Add specs for Chef::Knife::NodeEditor. - Add `policy_name` and `policy_group` to properties compared in `NodeEditor#updated?`. - Add `policy_name` and `policy_group` to Hash returned by `NodeEditor#view`. - Use `Node.from_hash` in `NodeEditor#apply_updates` instead of duplicating functionality. - Add some YARD docs for Chef::Knife::NodeEditor. | ||||
* | | Merge pull request #4400 from chef/tm/fix_environment_load | Lamont Granquist | 2016-01-13 | 1 | -1/+1 |
|\ \ | | | | | | | inflate an environment after loading it | ||||
| * | | inflate an environment after loading it | Thom May | 2016-01-13 | 1 | -1/+1 |
|/ / | | | | | | | this was missed in the great REST fire. | ||||
* | | Merge branch 'jk/chef-fs-cookbook-refactor' | John Keiser | 2016-01-13 | 9 | -101/+265 |
|\ \ | |/ |/| | |||||
| * | Split repository versioned and unversioned cookbooksjk/chef-fs-cookbook-refactor | John Keiser | 2016-01-13 | 4 | -18/+89 |
| | | |||||
| * | Split versioned cookbook dir from unversioned | John Keiser | 2016-01-13 | 5 | -25/+77 |
| | | |||||
| * | Split versioned and unversioned cookbooks into separate classes | John Keiser | 2016-01-13 | 3 | -65/+106 |
|/ | |||||
* | Merge pull request #4387 from chef/salam/chef-acceptance | Salim Alam | 2016-01-13 | 9 | -0/+82 |
|\ | | | | | Initial 'trivial' acceptance test suite | ||||
| * | Do some clean upsalam/chef-acceptance | Salim Alam | 2016-01-12 | 5 | -157/+18 |
| | | |||||
| * | Initial 'trivial' acceptance test suite | Salim Alam | 2016-01-12 | 11 | -0/+221 |
| | | |||||
* | | Merge pull request #4396 from chef/ssd/duplicate-password | Thom May | 2016-01-13 | 1 | -1/+0 |
|\ \ | | | | | | | Remove duplicate initialization of @password in user_v1 | ||||
| * | | Remove duplicate initialization of @password in user_v1ssd/duplicate-password | Steven Danna | 2016-01-13 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #4393 from chef/lcg/duplicated-keys | Lamont Granquist | 2016-01-13 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | fix Lint/DuplicatedKey | ||||
| * | | | fix Lint/DuplicatedKeylcg/duplicated-keys | Lamont Granquist | 2016-01-13 | 1 | -3/+6 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so, this is a bit special... the API for "priority" is clearly broken. but this broken API comes from the service resource itself which appears to have been broken by design since at least 2010. just fixing the code for how it behaves and dropping in FIXMEs for now, since this uncovered a fairly massive API-breaking yak. | ||||
* | | | Merge pull request #4395 from chef/lcg/lint-cops-again | Thom May | 2016-01-13 | 3 | -22/+4 |
|\ \ \ | | | | | | | | | yet more lint cops | ||||
| * | | | yet more lint copslcg/lint-cops-again | Lamont Granquist | 2016-01-13 | 3 | -22/+4 |
| |/ / | | | | | | | | | | | | | | | | | | | fixes: Lint/AmbiguousOperator Lint/DuplicateMethods | ||||
* | | | Merge branch 'jk/chef-fs-split' | John Keiser | 2016-01-13 | 70 | -2734/+2811 |
|\ \ \ | |/ / |/| | | |||||
| * | | Make external tests work locally betterjk/chef-fs-split | John Keiser | 2016-01-13 | 1 | -2/+2 |
| | | | |||||
| * | | Restore backcompat include for external libraries that reference root ↵ | John Keiser | 2016-01-13 | 3 | -2/+12 |
| | | | | | | | | | | | | directories directly | ||||
| * | | Move server and repository fs objects to their own directories | John Keiser | 2016-01-13 | 66 | -2730/+2797 |
|/ / | |||||
* | | Merge pull request #4390 from chef/tm/fix_fail | Lamont Granquist | 2016-01-13 | 3 | -3/+3 |
|\ \ | | | | | | | Correct uses of fail to raise | ||||
| * | | Correct uses of fail to raisetm/fix_fail | Thom May | 2016-01-13 | 3 | -3/+3 |
| | | | | | | | | | | | | Style/SignalException - 3 | ||||
* | | | Merge pull request #4344 from chef/if/warn-on-reload-resource | Thom May | 2016-01-13 | 3 | -4/+4 |
|\ \ \ | |/ / |/| | | Warn (v. info) when reloading resources | ||||
| * | | debug log messages upon reloaded resourcesif/warn-on-reload-resource | Isa Farnik | 2016-01-12 | 3 | -4/+4 |
| | | | | | | | | | | | | tests for debug messages when reloading resources | ||||
* | | | Merge pull request #4388 from chef/lcg/more-rubocop-lint | Thom May | 2016-01-13 | 5 | -16/+12 |
|\ \ \ | |_|/ |/| | | more rubocop fixes | ||||
| * | | more rubocop fixeslcg/more-rubocop-lint | Lamont Granquist | 2016-01-12 | 6 | -17/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes: Lint/UnreachableCode Lint/NonLocalExitFromIterator Lint/LiteralInCondition Lint/EmptyEnsure Lint/DefEndAlignment Lint/CircularArgumentReference | ||||
* | | | Merge pull request #4385 from chef/ksubrama/exclude | Kartik Null Cating-Subramanian | 2016-01-12 | 1 | -4/+4 |
|\ \ \ | |_|/ |/| | | Pull in the latest omnibus software | ||||
| * | | Pull in the latest omnibus software | Kartik Null Cating-Subramanian | 2016-01-12 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #4384 from chef/lcg/really-fix-cops | Lamont Granquist | 2016-01-12 | 38 | -536/+536 |
|\ \ \ | |/ / |/| | | really fix cops | ||||
| * | | really fix copslcg/really-fix-cops | Lamont Granquist | 2016-01-12 | 38 | -536/+536 |
| |/ | |||||
* | | Merge pull request #4383 from chef/ksubrama/cleanup | Thom May | 2016-01-12 | 8 | -16/+4 |
|\ \ | | | | | | | Bringing in open PRs with +1s from omnibus-chef | ||||
| * | | Update dmg icon | Kartik Null Cating-Subramanian | 2016-01-12 | 1 | -0/+0 |
| | | | |||||
| * | | Remove references to shef | Kartik Null Cating-Subramanian | 2016-01-12 | 6 | -15/+3 |
| | | | |||||
| * | | Update API endpoint in omnibus Berksfile | Kartik Null Cating-Subramanian | 2016-01-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4373 from PatrickWalker/feature/issue-4268 | Thom May | 2016-01-12 | 2 | -1/+9 |
|\ \ \ | | | | | | | | | Ensuring running Help returns an exit code of 0 | ||||
| * | | | Ensuring running Help returns an exit code of 0 | Patrick Walker | 2016-01-11 | 2 | -1/+9 |
| | | | | |||||
* | | | | Merge pull request #4355 from kisoku/fix_json_create | Thom May | 2016-01-12 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | don't blow up when json object has no recipes | ||||
| * | | | | don't blow up when json object has no recipes | Mathieu Sauve-Frankel | 2016-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | fixes loading brand new node objects from json | ||||
* | | | | | Merge pull request #4343 from jordane/jordane/supports-use-platform-parser | Thom May | 2016-01-12 | 2 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | use platform parser with metadata supports | ||||
| * | | | | | Use platform version parser to parse supports in metadata | Jordan Evans | 2015-12-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously supports was using the cookbook version parser, which would not correctly parse all platform versions. | ||||
| * | | | | | add cookbook metadata that will fail tests | Jordan Evans | 2015-12-28 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cookbook metadata uses the supports method, which currently parses versions using the cookbook version parser, when it should be using the platform parser. | ||||
* | | | | | | Merge pull request #4378 from chef/choco_edits | Matt Wrock | 2016-01-12 | 2 | -5/+49 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | assert candidates exist for alternate sources and when pinning versions | ||||
| * | | | | | | assert candidates exist for alternate sources and when pinning versions | Matt Wrock | 2016-01-12 | 2 | -5/+49 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #4375 from chef/no_version_detect | Matt Wrock | 2016-01-12 | 3 | -94/+9 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | fixes #4354 and fixes #4372 stop trying to auto detect versions for exe installers |