summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use require_paths and not path so bundler grabs all paths from a git referencemwrock/appveyorMatt Wrock2016-01-251-1/+1
* Merge pull request #4455 from chef/tball/nexus7_more_failuresTyler Ball2016-01-251-1/+1
|\
| * wrlinux is a derivative of RHEL and as such the default creation of user home...tball/nexus7_more_failurestyler-ball2016-01-251-1/+1
* | Fix single-quoted stringsjk/4334John Keiser2016-01-251-22/+22
* | Fix #4334: don't warn about ambiguous property usageJohn Keiser2016-01-222-1/+30
|/
* Merge pull request #4449 from chef/ksubrama/testKartik Null Cating-Subramanian2016-01-222-8/+7
|\
| * SUNW_1.22.1 doesn't exist in libdl.so, shouldn't be in the mapfile for Solari...Scott Hain2016-01-221-1/+0
| * Bump omnibus and omnibus-software pins.Kartik Null Cating-Subramanian2016-01-221-7/+7
|/
* Merge pull request #4445 from chef/nathen/add_cbgbThom May2016-01-224-0/+215
|\
| * Follow chefstylenathen/add_cbgbNathen Harvey2016-01-211-3/+3
| * Add CBGB to the repositoryNathen Harvey2016-01-214-0/+215
* | Require Chef::VersionConstraint::Platform b/c it's used heredanielsdeleo2016-01-211-0/+1
* | Merge pull request #4444 from chef/tball/nexus7_test_failuresTyler Ball2016-01-214-11/+14
|\ \
| * | Using random names in the group_spec so we don't blow away a real accounttyler-ball2016-01-211-3/+3
| * | Pointing omnibus-software back to master now that https://github.com/chef/omn...tball/nexus7_test_failurestyler-ball2016-01-212-3/+2
| * | Solaris builds are failing because bundler-audit depends on Thor, which has a...tyler-ball2016-01-213-4/+8
| * | Test failures for the Cisco Nexus 7 platform in Manhattan. It cannot have up...tyler-ball2016-01-212-8/+8
| |/
* | 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
|/