summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Pin Chef/Ohai for AngryChef 12.6.0 rebuildschisamo/angrychef-12.6.0Seth Chisamore2016-01-141-2/+2
|
* Merge pull request #4405 from chef/tm/fix_failing_testThom May2016-01-141-2/+1
|\ | | | | ServerAPI will return a raw hash, so do that
| * ServerAPI will return a raw hash, so do thattm/fix_failing_testThom May2016-01-141-2/+1
|/
* Merge pull request #4382 from chef/tm/string_literalsThom May2016-01-141292-13080/+13082
|\ | | | | Use double quotes by default
| * Use double quotes by defaultThom May2016-01-141292-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_commaThom May2016-01-14244-1106/+1106
|\ | | | | autocorrecting Style/TrailingComma
| * autocorrecting Style/TrailingCommalcg/trailing_commaLamont Granquist2016-01-13244-1106/+1106
| | | | | | | | chefstyle -a fixed 1044 occurrances
* | Merge pull request #4402 from chef/jr/PR-4399-CHANGELOGJordan Running2016-01-131-0/+1
|\ \ | | | | | | Changelog for PR#4399
| * | Changelog for PR#4399Jordan Running2016-01-131-0/+1
|/ /
* | Merge pull request #4399 from chef/jr/knife-node-edit-save-policy_name-groupJordan Running2016-01-132-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-groupJordan Running2016-01-132-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_loadLamont Granquist2016-01-131-1/+1
|\ \ | | | | | | inflate an environment after loading it
| * | inflate an environment after loading itThom May2016-01-131-1/+1
|/ / | | | | | | this was missed in the great REST fire.
* | Merge branch 'jk/chef-fs-cookbook-refactor'John Keiser2016-01-139-101/+265
|\ \ | |/ |/|
| * Split repository versioned and unversioned cookbooksjk/chef-fs-cookbook-refactorJohn Keiser2016-01-134-18/+89
| |
| * Split versioned cookbook dir from unversionedJohn Keiser2016-01-135-25/+77
| |
| * Split versioned and unversioned cookbooks into separate classesJohn Keiser2016-01-133-65/+106
|/
* Merge pull request #4387 from chef/salam/chef-acceptanceSalim Alam2016-01-139-0/+82
|\ | | | | Initial 'trivial' acceptance test suite
| * Do some clean upsalam/chef-acceptanceSalim Alam2016-01-125-157/+18
| |
| * Initial 'trivial' acceptance test suiteSalim Alam2016-01-1211-0/+221
| |
* | Merge pull request #4396 from chef/ssd/duplicate-passwordThom May2016-01-131-1/+0
|\ \ | | | | | | Remove duplicate initialization of @password in user_v1
| * | Remove duplicate initialization of @password in user_v1ssd/duplicate-passwordSteven Danna2016-01-131-1/+0
| | |
* | | Merge pull request #4393 from chef/lcg/duplicated-keysLamont Granquist2016-01-131-3/+6
|\ \ \ | | | | | | | | fix Lint/DuplicatedKey
| * | | fix Lint/DuplicatedKeylcg/duplicated-keysLamont Granquist2016-01-131-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-againThom May2016-01-133-22/+4
|\ \ \ | | | | | | | | yet more lint cops
| * | | yet more lint copslcg/lint-cops-againLamont Granquist2016-01-133-22/+4
| |/ / | | | | | | | | | | | | | | | | | | fixes: Lint/AmbiguousOperator Lint/DuplicateMethods
* | | Merge branch 'jk/chef-fs-split'John Keiser2016-01-1370-2734/+2811
|\ \ \ | |/ / |/| |
| * | Make external tests work locally betterjk/chef-fs-splitJohn Keiser2016-01-131-2/+2
| | |
| * | Restore backcompat include for external libraries that reference root ↵John Keiser2016-01-133-2/+12
| | | | | | | | | | | | directories directly
| * | Move server and repository fs objects to their own directoriesJohn Keiser2016-01-1366-2730/+2797
|/ /
* | Merge pull request #4390 from chef/tm/fix_failLamont Granquist2016-01-133-3/+3
|\ \ | | | | | | Correct uses of fail to raise
| * | Correct uses of fail to raisetm/fix_failThom May2016-01-133-3/+3
| | | | | | | | | | | | Style/SignalException - 3
* | | Merge pull request #4344 from chef/if/warn-on-reload-resourceThom May2016-01-133-4/+4
|\ \ \ | |/ / |/| | Warn (v. info) when reloading resources
| * | debug log messages upon reloaded resourcesif/warn-on-reload-resourceIsa Farnik2016-01-123-4/+4
| | | | | | | | | | | | tests for debug messages when reloading resources
* | | Merge pull request #4388 from chef/lcg/more-rubocop-lintThom May2016-01-135-16/+12
|\ \ \ | |_|/ |/| | more rubocop fixes
| * | more rubocop fixeslcg/more-rubocop-lintLamont Granquist2016-01-126-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes: Lint/UnreachableCode Lint/NonLocalExitFromIterator Lint/LiteralInCondition Lint/EmptyEnsure Lint/DefEndAlignment Lint/CircularArgumentReference
* | | Merge pull request #4385 from chef/ksubrama/excludeKartik Null Cating-Subramanian2016-01-121-4/+4
|\ \ \ | |_|/ |/| | Pull in the latest omnibus software
| * | Pull in the latest omnibus softwareKartik Null Cating-Subramanian2016-01-121-4/+4
| | |
* | | Merge pull request #4384 from chef/lcg/really-fix-copsLamont Granquist2016-01-1238-536/+536
|\ \ \ | |/ / |/| | really fix cops
| * | really fix copslcg/really-fix-copsLamont Granquist2016-01-1238-536/+536
| |/
* | Merge pull request #4383 from chef/ksubrama/cleanupThom May2016-01-128-16/+4
|\ \ | | | | | | Bringing in open PRs with +1s from omnibus-chef
| * | Update dmg iconKartik Null Cating-Subramanian2016-01-121-0/+0
| | |
| * | Remove references to shefKartik Null Cating-Subramanian2016-01-126-15/+3
| | |
| * | Update API endpoint in omnibus BerksfileKartik Null Cating-Subramanian2016-01-121-1/+1
| | |
* | | Merge pull request #4373 from PatrickWalker/feature/issue-4268Thom May2016-01-122-1/+9
|\ \ \ | | | | | | | | Ensuring running Help returns an exit code of 0
| * | | Ensuring running Help returns an exit code of 0Patrick Walker2016-01-112-1/+9
| | | |
* | | | Merge pull request #4355 from kisoku/fix_json_createThom May2016-01-121-1/+1
|\ \ \ \ | | | | | | | | | | don't blow up when json object has no recipes
| * | | | don't blow up when json object has no recipesMathieu Sauve-Frankel2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | fixes loading brand new node objects from json
* | | | | Merge pull request #4343 from jordane/jordane/supports-use-platform-parserThom May2016-01-122-1/+6
|\ \ \ \ \ | | | | | | | | | | | | use platform parser with metadata supports
| * | | | | Use platform version parser to parse supports in metadataJordan Evans2015-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously supports was using the cookbook version parser, which would not correctly parse all platform versions.
View Lorry Controller Status