summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add a bit of git logging to see what we're doinglcg/rebase-against-masterLamont Granquist2016-01-151-0/+1
* fix bash syntaxLamont Granquist2016-01-151-1/+1
* try rebasing against master firstLamont Granquist2016-01-151-0/+1
* Merge branch 'jk/cookbook-artifacts'John Keiser2016-01-1512-23/+214
|\
| * 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 directorysvc_locationMatt Wrock2016-01-141-1/+1
* | Merge pull request #4377 from chef/choco_func_testsMatt Wrock2016-01-147-17/+162
|\ \ | |/ |/|
| * 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 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-s...tball/netsshtyler-ball2016-01-141-1/+1
* | | Merge pull request #4408 from chef/lcg/optional-chefstyleLamont Granquist2016-01-141-4/+8
|\ \ \ | |_|/ |/| |
| * | rescue the right exceptionlcg/optional-chefstyleLamont Granquist2016-01-141-1/+1
| * | make chefstyle optionalLamont Granquist2016-01-141-4/+8
|/ /
* | Merge pull request #4405 from chef/tm/fix_failing_testThom May2016-01-141-2/+1
|\ \
| * | 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 defaultThom May2016-01-141292-13080/+13082
|/ /
* | Merge pull request #4398 from chef/lcg/trailing_commaThom May2016-01-14244-1106/+1106
|\ \
| * | autocorrecting Style/TrailingCommalcg/trailing_commaLamont Granquist2016-01-13244-1106/+1106
* | | Merge pull request #4402 from chef/jr/PR-4399-CHANGELOGJordan Running2016-01-131-0/+1
|\ \ \
| * | | 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`jr/knife-node-edit-save-policy_name-groupJordan Running2016-01-132-35/+267
| |/ /
* | | Merge pull request #4400 from chef/tm/fix_environment_loadLamont Granquist2016-01-131-1/+1
|\ \ \
| * | | inflate an environment after loading itThom May2016-01-131-1/+1
|/ / /
* | | 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
|\ \
| * | 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_v1ssd/duplicate-passwordSteven Danna2016-01-131-1/+0
* | | | Merge pull request #4393 from chef/lcg/duplicated-keysLamont Granquist2016-01-131-3/+6
|\ \ \ \
| * | | | fix Lint/DuplicatedKeylcg/duplicated-keysLamont Granquist2016-01-131-3/+6
| |/ / /
* | | | Merge pull request #4395 from chef/lcg/lint-cops-againThom May2016-01-133-22/+4
|\ \ \ \
| * | | | yet more lint copslcg/lint-cops-againLamont Granquist2016-01-133-22/+4
| |/ / /
* | | | 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 directo...John Keiser2016-01-133-2/+12