summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Update CLA links to SupermarketJulian C. Dunn2014-08-181-3/+1
|/
* Merge pull request #1844 from opscode/sersut/tune-down-travis-notificationsSerdar Sutay2014-08-151-2/+3
|\
| * Modify travis notifications so that we are notified only when a stable branch...Serdar Sutay2014-08-151-2/+3
* | Update for CookbookSiteStreamingUploader change to use config option ssl_veri...Claire McQuin2014-08-151-0/+4
* | Update for new config default enable client-side key generationClaire McQuin2014-08-151-0/+5
|/
* Merge pull request #1841 from opscode/lcg/disable-rhel-e2elamont-granquist2014-08-151-10/+0
|\
| * disable rhel tests completely for nowLamont Granquist2014-08-151-10/+0
|/
* Merge pull request #1831 from jbsmith86/masterBryan McLellan2014-08-151-1/+1
|\
| * Spelling errorjbsmith862014-08-141-1/+1
* | Merge branch 'mcquin/Issues-1518'Claire McQuin2014-08-153-2/+34
|\ \
| * \ Merge branch 'master' into mcquin/Issues-1518Claire McQuin2014-08-158-100/+146
| |\ \ | |/ / |/| |
* | | Merge pull request #1835 from opscode/mcquin/travis_secure_env_vars_againClaire McQuin2014-08-141-2/+2
|\ \ \
| * | | Don't swallow end to end failuresmcquin/travis_secure_env_vars_againClaire McQuin2014-08-141-2/+2
* | | | Merge branch 'mcquin/Issues-1711'Claire McQuin2014-08-143-78/+88
|\ \ \ \
| * | | | Enable client-side key generation by default (resolves https://github.com/ops...Claire McQuin2014-08-143-78/+88
|/ / / /
* | | | Merge pull request #1820 from opscode/mcquin/Issues-1446Claire McQuin2014-08-143-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Update for remove recipe dsl from base provisioner.mcquin/Issues-1446Claire McQuin2014-08-141-0/+2
| * | | Just use query_helpersClaire McQuin2014-08-141-1/+1
| * | | Remove recipe DSL from base provider.Claire McQuin2014-08-142-2/+1
* | | | 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
|/ /
| * Update for 1518mcquin/Issues-1518Claire McQuin2014-08-151-0/+1
| * Rename spec and add verify_mode tests.Claire McQuin2014-08-141-0/+220
| * CookbookSiteStreamingUploader uses ssl_verify_mode.Claire McQuin2014-08-142-201/+12
|/
* 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