summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fooksubrama/test1Kartik Null Cating-Subramanian2016-01-211-7/+7
* Merge pull request #4436 from chef/salam/windows-service-testSalim Alam2016-01-216-0/+94
|\
| * 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 #4371 from chef/tm/bundle_auditThom May2016-01-212-1/+4
|\ \
| * | Ensure gem dependencies are securetm/bundle_auditThom May2016-01-212-1/+4
|/ /
* | Merge pull request #4423 from chef/tm/rest_deprecationThom May2016-01-2125-21/+50
|\ \
| * | deprecate a few more callstm/rest_deprecationThom May2016-01-194-8/+12
| * | Ensure we use from_hash rather than the deprecated json_createThom May2016-01-182-2/+2
| * | we know that Chef::REST is deprecatedThom May2016-01-181-0/+1
| * | tidy up cookbook_loaderThom May2016-01-181-1/+1
| * | ensure unit tests are correctThom May2016-01-188-7/+21
| * | add deprecation warningsThom May2016-01-189-3/+13
* | | Merge pull request #4439 from chef/tball/win2008r2_test_failuresTyler Ball2016-01-201-0/+3
|\ \ \
| * | | Sometimes chocolately doesn't appear on the path, so adding two fixes.tball/win2008r2_test_failurestyler-ball2016-01-201-0/+3
|/ / /
* | | Merge pull request #4438 from chef/why_choco_no_installMatt Wrock2016-01-201-2/+2
|\ \ \
| * | | die die die if functional test fails to install chocolateywhy_choco_no_installMatt Wrock2016-01-201-2/+2
|/ / /
* | | Merge pull request #4432 from chef/tm/back_compat_rest_callsThom May2016-01-201-0/+6
|\ \ \
| * | | add get_rest etc calls to ServerAPItm/back_compat_rest_callsThom May2016-01-201-0/+6
| | |/ | |/|
* | | Merge pull request #4435 from chef/lcg/chef-addonsLamont Granquist2016-01-202-1/+2
|\ \ \ | |/ / |/| |
| * | add nokogiri to omnibus-cheflcg/chef-addonsLamont Granquist2016-01-192-1/+2
|/ /
* | Merge pull request #4433 from chef/lcg/content-length-infoLamont Granquist2016-01-191-1/+4
|\ \
| * | add a comment on exception triggersLamont Granquist2016-01-191-1/+4
* | | Merge pull request #4419 from chef/batMatt Wrock2016-01-193-6/+6
|\ \ \ | |/ / |/| |
| * | explicitly adding .bat to service executable called by service in case users ...Matt Wrock2016-01-193-6/+6
|/ /
* | Merge pull request #4424 from chef/lcg/chefstyle-catchup2Lamont Granquist2016-01-198-38/+37
|\ \
| * | another chefstyle catchup + pull masterlcg/chefstyle-catchup2Lamont Granquist2016-01-188-38/+37
* | | Merge pull request #4426 from chef/lcg/float-kitchen-appbundle-updaterLamont Granquist2016-01-191-1/+1
|\ \ \
| * | | let kitchen-appbundle-updater floatlcg/float-kitchen-appbundle-updaterLamont Granquist2016-01-181-1/+1
| |/ /
* | | Merge pull request #4425 from chef/lcg/percentliteraldelimetersLamont Granquist2016-01-1993-225/+225
|\ \ \ | |/ / |/| |
| * | Autofixing Style/PercentLiteralDelimeterslcg/percentliteraldelimetersLamont Granquist2016-01-1893-225/+225
|/ /
* | Revert "another chefstyle catchup + pull master"Lamont Granquist2016-01-188-37/+38
* | another chefstyle catchup + pull masterLamont Granquist2016-01-188-38/+37
|/
* Merge pull request #4420 from tcyrus/patch-1Thom May2016-01-181-22/+25
|\
| * 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
| * 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
|\
| * removing chefstyle pinLamont Granquist2016-01-151-1/+1
View Lorry Controller Status