summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Rubocop errorssalam/windows-service-testSalim Alam2016-01-201-11/+11
|
* Add check for Windows OSSalim Alam2016-01-191-1/+4
|
* Chef running as a Windows service acceptance testSalim Alam2016-01-196-0/+91
|
* Merge pull request #4433 from chef/lcg/content-length-infoLamont Granquist2016-01-191-1/+4
|\ | | | | add a comment on exception triggers
| * add a comment on exception triggersLamont Granquist2016-01-191-1/+4
| | | | | | | | | | this is almost always a real networking issue and there is no bug in chef-client.
* | Merge pull request #4419 from chef/batMatt Wrock2016-01-193-6/+6
|\ \ | |/ |/| explicitly adding .bat to service executable called by service in cae users remove .bat from PATHEXT
| * explicitly adding .bat to service executable called by service in case users ↵Matt Wrock2016-01-193-6/+6
|/ | | | remove .bat from PATHEXT
* Merge pull request #4424 from chef/lcg/chefstyle-catchup2Lamont Granquist2016-01-198-38/+37
|\ | | | | another chefstyle catchup + pull master
| * another chefstyle catchup + pull masterlcg/chefstyle-catchup2Lamont Granquist2016-01-188-38/+37
| | | | | | | | | | | | | | bunch of merges over the weekend need re-fixing again. seems like pointing at master of chefstyle is probably a good idea to start making people fix their code before merging.
* | Merge pull request #4426 from chef/lcg/float-kitchen-appbundle-updaterLamont Granquist2016-01-191-1/+1
|\ \ | | | | | | let kitchen-appbundle-updater float
| * | let kitchen-appbundle-updater floatlcg/float-kitchen-appbundle-updaterLamont Granquist2016-01-181-1/+1
| |/ | | | | | | i'm a bit surprised this still even works at all..
* | Merge pull request #4425 from chef/lcg/percentliteraldelimetersLamont Granquist2016-01-1993-225/+225
|\ \ | |/ |/| Autofixing Style/PercentLiteralDelimeters
| * Autofixing Style/PercentLiteralDelimeterslcg/percentliteraldelimetersLamont Granquist2016-01-1893-225/+225
|/ | | | | | See chef/chefstyle#11 for analysis and discussion. We select '{}' since audit of our source code shows that is the most common, and that used to be the dominant learning paradigm (e.g. in ruby 1.9 pickaxe book.
* Revert "another chefstyle catchup + pull master"Lamont Granquist2016-01-188-37/+38
| | | | This reverts commit ccf46bf3055b2a1c06499ec104f3d74c26643395.
* another chefstyle catchup + pull masterLamont Granquist2016-01-188-38/+37
| | | | | | | bunch of merges over the weekend need re-fixing again. seems like pointing at master of chefstyle is probably a good idea to start making people fix their code before merging.
* Merge pull request #4420 from tcyrus/patch-1Thom May2016-01-181-22/+25
|\ | | | | Update README.md
| * Update README.mdTimothy Cyrus2016-01-161-22/+25
|/
* Merge branch 'jk/cookbook-artifacts-local-mode'John Keiser2016-01-154-48/+143
|\
| * No cookbook versions is missing cookbookjk/cookbook-artifacts-local-modeJohn Keiser2016-01-151-0/+3
| |
| * Split identifier from name for cookbook_artifactsJohn Keiser2016-01-151-1/+3
| |
| * Don't treat the cookbook as missing just because it has no versions--John Keiser2016-01-151-3/+0
| | | | | | | | that is for the higher level (chef server) to do
| * Create a default cookbook artifact that looks like what the pedant tests expectJohn Keiser2016-01-151-1/+18
| |
| * Treat cookbook artifacts the same as cookbooks for local modeJohn Keiser2016-01-151-48/+48
| |
| * Make local cookbook artifacts load correctlyJohn Keiser2016-01-153-1/+77
|/
* Merge branch 'jk/policies-local-mode'John Keiser2016-01-153-41/+194
|\
| * Allow top level directories to be created in local modejk/policies-local-modeJohn Keiser2016-01-151-1/+1
| |
| * Treat repository policies dir as one level (/policies/name-revision.json)John Keiser2016-01-152-20/+76
| |
| * Make local mode respect policiesJohn Keiser2016-01-151-26/+84
| |
| * Add policies dir that allows directory childrenJohn Keiser2016-01-152-4/+43
|/
* Merge pull request #4415 from chef/lcg/chefstyle-catchupLamont Granquist2016-01-155-36/+36
|\ | | | | fix chefstyle failures
| * removing chefstyle pinLamont Granquist2016-01-151-1/+1
| | | | | | | | lets float so that PRs pick up new versions
| * fix chefstyle failuresLamont Granquist2016-01-154-35/+35
| | | | | | | | | | | | | | | | autocorrects some merges that will be broken when the next chefstyle is released. also runs chefstyle after the travis tests, because i'd rather know how the code is broken rather than how its not pretty.
* | 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 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
| | |