summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't swallow end to end failuresmcquin/travis_secure_env_vars_againClaire McQuin2014-08-141-2/+2
* Merge pull request #1832 from opscode/lcg/proxy-var-fixeslamont-granquist2014-08-143-17/+51
|\
| * add notes on bugfixes to CHANGELOGLamont Granquist2014-08-141-0/+3
| * add spec tests for http_proxy fixesLamont Granquist2014-08-141-9/+32
| * fix proxy var issuesLamont Granquist2014-08-141-8/+16
* | Merge pull request #1829 from opscode/mcquin/travis_secure_env_varsClaire McQuin2014-08-142-4/+5
|\ \ | |/ |/|
| * Append '|| true' to make unrun tests passClaire McQuin2014-08-141-2/+2
| * Only run end to end tests on Travis when secure environment variables are ava...Claire McQuin2014-08-142-4/+5
|/
* Merge pull request #1812 from opscode/sersut/chef-1773Serdar Sutay2014-08-135-2/+112
|\
| * Changelog info for freebsd_resource matching for ChefSpec.Serdar Sutay2014-08-131-0/+1
| * Make sure freebsd_package is captured with the resource name it's declared wi...Serdar Sutay2014-08-134-2/+111
* | Merge pull request #1810 from opscode/lcg/json-comment-testslamont-granquist2014-08-137-1/+29
|\ \
| * | fix typo in commentLamont Granquist2014-08-136-6/+6
| * | add JSONCompat test for parsing JSON commentsLamont Granquist2014-08-131-1/+17
| * | adding some comments to fixturesLamont Granquist2014-08-136-0/+12
|/ /
* | Merge pull request #1764 from opscode/mcquin/ubuntu-testsClaire McQuin2014-08-1328-111/+492
|\ \ | |/ |/|
| * Update for Ubuntu end-to-end tests.Claire McQuin2014-08-131-0/+22
| * Add test instructions and contributing information.Claire McQuin2014-08-131-46/+78
| * Remove kitchen tests from spec/ directory, so tests can be run separately.Claire McQuin2014-08-1320-15/+18
| * Create and test cookbook on Ubuntu 12.04Claire McQuin2014-08-1321-46/+369
| * Add information on using Test Kitchen for E2E testing.Claire McQuin2014-08-131-1/+2
|/
* Merge pull request #1811 from opscode/lcg/rhel-7-e2elamont-granquist2014-08-132-0/+12
|\
| * e2e test on rhel found a bugLamont Granquist2014-08-121-0/+2
| * use ec2-user for rhel7 imageLamont Granquist2014-08-121-1/+1
| * use a flavor that supports HVMLamont Granquist2014-08-121-0/+1
| * add rhel 7 e2e testLamont Granquist2014-08-121-0/+9
* | Merge pull request #1800 from opscode/sersut/chef#1634Serdar Sutay2014-08-1319-425/+3783
|\ \
| * | Changelog information for user dscl provider updates.Serdar Sutay2014-08-132-3/+54
| * | Updates based on PR comments.Serdar Sutay2014-08-123-25/+38
| * | * Dscl user provider changes to support Mac 10.7, 10.8 & 10.9.Serdar Sutay2014-08-1217-422/+3716
* | | Merge pull request #1814 from opscode/sersut/travis-fixSerdar Sutay2014-08-121-8/+13
|\ \ \ | |/ / | | / | |/ |/|
| * Do not use :Win32 outside of let, describe, it blocks since we don't have it ...Serdar Sutay2014-08-121-8/+13
|/
* Merge pull request #1771 from opscode/btm/CHEF-5022Bryan McLellan2014-08-128-38/+286
|\
| * CHEF-5022: Add tests for #set_start_type and cleanupBryan McLellan2014-08-122-5/+16
| * Update release notes for CHEF-5022Bryan McLellan2014-08-123-0/+27
| * CHEF-5022: Don't use provides in the resourceBryan McLellan2014-08-121-1/+4
| * CHEF-5022: Rename start_type to current_start_typeBryan McLellan2014-08-122-9/+9
| * CHEF-5022: leave enabled to nil for all other statesBryan McLellan2014-08-122-1/+13
| * CHEF-5022: Add configure_startup actionBryan McLellan2014-08-124-73/+117
| * CHEF-5022: Differentiate between Windows service startup_typesBryan McLellan2014-08-125-21/+172
|/
* Revert "Reset DOC_CHANGES for 12.0"danielsdeleo2014-08-121-0/+9
* Merge pull request #1806 from opscode/lcg/removing-json-class1lamont-granquist2014-08-126-10/+9
|\
| * remove some uses of from_jsonLamont Granquist2014-08-126-10/+9
* | Merge pull request #1772 from opscode/chef-1765Serdar Sutay2014-08-123-30/+41
|\ \
| * | Update CHANGELOG with information about bug fix.Serdar Sutay2014-08-121-28/+29
| * | Return values with Time class after stubbing :now of Time.Serdar Sutay2014-08-121-1/+2
| * | don't return negative timeClaire McQuin2014-08-121-1/+1
| * | Ensure reported elapsed_time is nonnegative.Claire McQuin2014-08-121-2/+8
| * | chef-client should never send negative values for duration to reporting; fixe...Jeremiah Snapp2014-08-121-0/+3
* | | Update release notes and doc changes files for metadata name changedanielsdeleo2014-08-122-0/+16