summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix unused variables and commentsjk/cookbook-artifactsJohn Keiser2016-01-152-4/+0
|
* Make upload cookbook_artifacts workJohn Keiser2016-01-154-4/+28
|
* Get download of cookbook_artifacts workingJohn Keiser2016-01-154-12/+18
|
* Add server cookbook artifacts and list_specJohn Keiser2016-01-158-11/+173
|
* Add local cookbook_artifactsJohn Keiser2016-01-153-7/+10
|
* Merge pull request #4413 from chef/svc_locationMatt Wrock2016-01-151-1/+1
|\ | | | | configure chef client windows service to the correct chef directory
| * configure chef client windows service to the correct chef directorysvc_locationMatt Wrock2016-01-141-1/+1
| |
* | Merge pull request #4377 from chef/choco_func_testsMatt Wrock2016-01-147-17/+162
|\ \ | |/ |/| fixing candidate filtering and adding functional tests for chocolatey_package
| * adding functional tests for chocolatey providerchoco_func_testsMatt Wrock2016-01-142-6/+19
| |
| * fix candidate version filteringMatt Wrock2016-01-142-17/+54
| |
| * adding some functional tests for chocolatey_packageMatt Wrock2016-01-144-0/+95
| |
* | Merge pull request #4411 from chef/ksubrama/omnibusbumpKartik Null Cating-Subramanian2016-01-141-7/+7
|\ \ | | | | | | Bump omnibus
| * | Bump omnibusKartik Null Cating-Subramanian2016-01-141-7/+7
|/ /
* | Merge pull request #4406 from chef/tball/netsshTyler Ball2016-01-141-1/+1
|\ \ | | | | | | Updating to the latest release of net-ssh to consume https://github.com/net-ssh/net-ssh/pull/280
| * | Updating to the latest release of net-ssh to consume ↵tball/netsshtyler-ball2016-01-141-1/+1
| | | | | | | | | | | | https://github.com/net-ssh/net-ssh/pull/280
* | | Merge pull request #4408 from chef/lcg/optional-chefstyleLamont Granquist2016-01-141-4/+8
|\ \ \ | |_|/ |/| | make chefstyle optional in the Rakefile
| * | rescue the right exceptionlcg/optional-chefstyleLamont Granquist2016-01-141-1/+1
| | |
| * | make chefstyle optionalLamont Granquist2016-01-141-4/+8
|/ / | | | | | | | | | | | | | | if you 'bundle install --without development test' then the Rakefile will be broken without this. breaks appbundle-updater, so not sure how our kitchen tests are passing...
* | 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