summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hacking in a test segmentlcg/add-test-segmentLamont Granquist2014-08-273-1/+14
* Remove deprecated @node ivarsjk/remove_deprecated_ivarsJohn Keiser2014-08-273-10/+3
* Clean up acl data handler, add username to user handler for cheffishjk/data_handler_cleanupJohn Keiser2014-08-272-2/+3
* Merge pull request #1896 from opscode/lcg/1869lamont-granquist2014-08-261-2/+7
|\
| * response.body may be nilLamont Granquist2014-08-221-2/+7
* | Merge pull request #1885 from opscode/sersut/bootstrap-12Serdar Sutay2014-08-2614-552/+357
|\ \
| * | Update CHANGELOG and RELEASE_NOTES with bootstrap changes.Serdar Sutay2014-08-262-0/+11
| * | Fixes based on PR comments.Serdar Sutay2014-08-262-17/+32
| * | Specs for bootstrap cleanup.Serdar Sutay2014-08-263-186/+292
| * | Fixes based on the PR comments.Serdar Sutay2014-08-263-8/+78
| * | Remove encrypted_data_bag_secret distribution via Chef::Config and enable dis...Serdar Sutay2014-08-265-59/+4
| * | Deprecate --distro and --template-file options in favor of --template.Serdar Sutay2014-08-263-28/+44
| * | Remove the bootstrap templates that does chef install via gems.Serdar Sutay2014-08-2610-359/+1
|/ /
* | Merge branch 'jm/warn_on_everything' PR #1913jmink2014-08-253-3/+70
|\ \
| * | Warn on using 'everything' for knife download on a hosted setup PR #1913jmink2014-08-253-3/+70
|/ /
* | Revert "add retries in additional cases"Lamont Granquist2014-08-231-19/+5
* | add retries in additional casesLamont Granquist2014-08-231-5/+19
* | Merge pull request #1851 from opscode/lcg/chef-4101lamont-granquist2014-08-233-5/+22
|\ \
| * | add CHANGELOG.md for PR#719Lamont Granquist2014-08-231-2/+2
| * | CHEF-4101: DeepMerge - support overwriting hash values with nilMalte Swart2014-08-232-3/+20
|/ /
* | Merge pull request #1854 from opscode/lcg/config_dirlamont-granquist2014-08-233-22/+70
|\ \
| * | CHANGELOG.md for 1854Lamont Granquist2014-08-231-1/+2
| * | Use path_join to create local-mode-cacheJohn Keiser2014-08-232-21/+68
|/ /
* | Changelog update for #1705Bryan McLellan2014-08-221-0/+1
* | unpack the conditionals a little for readabilityBryan McLellan2014-08-221-2/+5
* | Make exception for a user not existing more explicitBryan McLellan2014-08-223-8/+9
* | Look up username instead of resource nameBryan McLellan2014-08-222-1/+8
* | Update to chef-zero 3John Keiser2014-08-225-7/+13
* | Merge pull request #1853 from opscode/mcquin/Issues-1849Claire McQuin2014-08-228-31/+240
|\ \ | |/ |/|
| * Update for enhancement of data_bag_item to fetch encrypted data bag items.Claire McQuin2014-08-223-3/+13
| * Add error logging on failure to load secret file.Claire McQuin2014-08-222-14/+32
| * Ignore v3 encryption detection on ruby < 2.0.Claire McQuin2014-08-221-1/+1
| * Clarify encrypted data detection.Claire McQuin2014-08-221-6/+7
| * Add ::encryptor_keys to versioned encryptor classes.Claire McQuin2014-08-223-36/+24
| * Fix stubs.Claire McQuin2014-08-221-12/+21
| * Update for changed error message return.Claire McQuin2014-08-221-1/+1
| * Enable autodetection of encrypted data bag items.Claire McQuin2014-08-223-19/+128
| * Spec out behavior for autodetecting encrypted data bag items.Claire McQuin2014-08-221-1/+57
| * Update to RSpec 3 syntax.Claire McQuin2014-08-221-23/+41
|/
* Merge pull request #1890 from opscode/lcg/changelog-cleanuplamont-granquist2014-08-221-117/+14
|\
| * remove 11.12.8 referencesLamont Granquist2014-08-211-73/+0
| * cleanup CHANGELOG.md duplicationLamont Granquist2014-08-211-44/+14
* | Merge pull request #1889 from opscode/lcg/1781lamont-granquist2014-08-223-2/+13
|\ \ | |/
| * add CHANGELOG for PR#1781Lamont Granquist2014-08-211-0/+2
| * there is always an option!James Belchamber2014-08-212-6/+2
| * stupid end where the end shouldn't endJames Belchamber2014-08-211-1/+0
| * remount now honours optionsJames Belchamber2014-08-212-1/+15
|/
* Merge pull request #1888 from opscode/lcg/1738lamont-granquist2014-08-216-75/+311
|\
| * add md filesLamont Granquist2014-08-212-0/+6
| * CHEF-1737: Minor clean up.markgibbons2014-08-211-3/+2