summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrect link syntax in CONTRIBUTINGBryan McLellan2012-12-141-1/+1
|
* Update contributing for new code review workflowBryan McLellan2012-12-141-2/+5
|
* [CHEF-3249] Extend the 'source' option to also apply to templates from the ↵Andrea Campi2012-12-141-2/+4
| | | | cookbook, not just local templates.
* [CHEF-3249] Add documentation on rendering partials.Andrea Campi2012-12-141-0/+23
|
* [CHEF-3249] Replace ternary operators with more explicit conditionals; split ↵Andrea Campi2012-12-141-3/+19
| | | | them out to separate methods for ease of maintenance.
* [CHEF-3249] Fix nested partials; add a test for that.Andrea Campi2012-12-143-1/+11
|
* [CHEF-3249] Accept an optional 'source' option to override the actual path ↵Andrea Campi2012-12-142-1/+17
| | | | | | to the partial. This is mostly for uniformity with the template resource.
* [CHEF-3249] Add tests to verify that variables passed to a partial properly ↵Andrea Campi2012-12-141-0/+16
| | | | replace any variable by the same name, but only within that partial.
* [CHEF-3249] Refactor template name resolution out to a separate class for ↵Andrea Campi2012-12-144-22/+101
| | | | DRYness and readability. While here let's also extend the API to support local templates, as well as templates from other cookbooks.
* [CHEF-3249] Basic implementation of partials in templates.Andrea Campi2012-12-143-0/+61
|
* Merge branch 'windows-jenkins-backport'sdelano2012-12-146-10/+22
|\
| * swap arguments on File.joinsdelano2012-12-141-3/+3
| |
| * use Dir.tmpdir for remote_directory spec testssdelano2012-12-141-3/+3
| |
| * Fix directory_spec on Windows.sersut2012-12-141-4/+7
| |
| * Marking more tests not to run on Win2k3sersut2012-12-142-2/+2
| |
| * Disable link tests on Windows Server 2003 since symlink is not yet supported ↵sersut2012-12-143-1/+10
|/ | | | on this platform.
* CHEF-2627: Return non-zero exit code when any ssh command failsMatthew Horan & Ryan Ong2012-12-142-6/+41
|
* CHEF-2627: Exit with non-zero exit code when ssh command failsMatthew Horan & Ryan Ong2012-12-143-4/+63
|
* CHEF-3660: rename files that didn't play nice with git rebasesdelano2012-12-132-0/+0
|
* Merge branch 'CHEF-3660-backport'sdelano2012-12-136-6/+88
|\
| * CHEF-3660: only monkeypatch on ruby 1.9 and earliersdelano2012-12-131-30/+32
| |
| * CHEF-3660: Add FileUtils::Entry_ monkey patchsdelano2012-12-132-0/+64
| | | | | | | | | | This change is equivalent to the changes made to core Ruby at: - https://github.com/ruby/ruby/commit/7d89ecdc523aab7b9908501b6743da2c26a53825
| * CHEF-3660: add functional tests for executing FileUtils.cp_r(:preserve) on ↵sdelano2012-12-132-1/+17
| | | | | | | | symlinks
| * CHEF-3660: use FileUtils.cp_r to copy directories in deploy_providersdelano2012-12-133-5/+5
|/
* [CHEF-3632] removed duplicated provider#whyrun_supported? methodXabier de Zuazo2012-12-131-4/+0
|
* [CHEF-3632] All providers have whyrun enabled by default due to RemoteDirectoryXabier de Zuazo2012-12-132-4/+7
|
* Merge branch 'CHEF-3688'danielsdeleo2012-12-124-423/+13
|\
| * CHEF-3688 remove stale attribute read protectionAdam Jacob2012-12-124-423/+13
|/ | | | | | This commit removes stale attribute read protection, as it does more harm than good. Includes removal of passing "root" around to immutablize.
* Merge branch 'CHEF-3662'danielsdeleo2012-12-124-61/+78
|\
| * [CHEF-3662] ApiClient includes private key in JSON if presentdanielsdeleo2012-12-122-19/+23
| | | | | | | | | | | | | | | | After discussing with Adam and Seth F, there's no reason not to put the private key in the serialized representation if we have it. We ought to carefully review for behavior changes on the server side before backporting to 10.x
| * [CHEF-3662] knife client reregister uses ApiClient#reregisterdanielsdeleo2012-12-123-26/+33
| |
| * [CHEF-3662] ApiClient can set a private key from JSONdanielsdeleo2012-12-122-17/+23
|/ | | | | | | | Without this change it's not possible to fix CHEF-3662 on the client without modifying Chef::REST to ignore json_class. Previously the behavior was explicitly defined to be the opposite, but the reasoning behind this decision wasn't documented; I suspect it may have been for server-side behavior that's no longer necessary.
* Merge branch 'CHEF-3680'danielsdeleo2012-12-123-8/+29
|\
| * [CHEF-3680] don't invalidate computed attributes on dupdanielsdeleo2012-12-113-1/+22
| |
| * [CHEF-3680] #merge isn't destructive, #merge! isdanielsdeleo2012-12-111-1/+1
| |
| * [CHEF-3680] Specify file and line for evaldanielsdeleo2012-12-112-6/+6
|/
* Merge pull request #489 from aspiers/CHEF-3619Dan DeLeo2012-12-111-1/+1
|\ | | | | [CHEF-3619] fix obsolete require of 'rake/rdoctask'
| * [CHEF-3619] fix obsolete require of 'rake/rdoctask'Adam Spiers2012-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rake/doctask' has been deprecated for quite a while but since version 10.0.0, rake no longer simply warns, and now fails with a cryptic error: $ rake -T rake aborted! GONE /home/adam/chef/Rakefile:24:in `require' /home/adam/chef/Rakefile:24:in `<top (required)>' /home/adam/.rvm/gems/ruby-1.9.3-p194@chef/bin/ruby_noexec_wrapper:14:in `eval' /home/adam/.rvm/gems/ruby-1.9.3-p194@chef/bin/ruby_noexec_wrapper:14:in `<main>' (See full trace by running task with --trace)
* | [CHEF-3662] fix spec for ruby 1.8.7danielsdeleo2012-12-061-1/+2
| | | | | | | | Can only expect exception class, not an instance.
* | [CHEF-3662] ApiClient can reregister itselfdanielsdeleo2012-12-062-1/+84
| |
* | Fixes CHEF-3639: 'knife index rebuild' no longer works with Chef Server 11Christopher Maier2012-12-052-83/+127
|\ \
| * | Further cleanup of #nagChristopher Maier2012-12-041-1/+2
| | |
| * | Use ui.confirm in nag instead of custom logicChristopher Maier2012-12-042-34/+1
| | | | | | | | | | | | Removed tests for #nag, since now that amounts to testing ui.confirm.
| * | Use ui error, warn, and info messages instead of putsChristopher Maier2012-12-041-4/+3
| | |
| * | Total rewrite of knife index rebuild testsChristopher Maier2012-12-041-33/+123
| | |
| * | Restructure index_rebuild to facilitate testingChristopher Maier2012-12-041-43/+30
| | | | | | | | | | | | | | | | | | Essentially spilt functionality out into several methods, and simplify logic. API information retrieval is now a discrete step. Testing for a unsupported version now relies solely on the presence of version information, since only Chef 11 has this information, and only Chef 11 has the alternative reindexing strategy. Warning messages are handled by their own methods.
* | | Merge branch 'highlight-cb-names-in-err-msg'danielsdeleo2012-12-051-1/+1
|\ \ \
| * | | Quote cookbook name/version in error messagedanielsdeleo2012-12-051-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | User was getting an error message: > ERROR: Cookbook git depends on cookbook runit, version >= 0.0.0, Issue was the metadata for git had a dependency on 'runit,'. Should probably also add validation to metadata depends for cookbook names, but generally quoting user-supplied values in error messages makes this kind of issue more obvious, so this should be a worthwhile quick fix.
* | | Merge branch 'CHEF-3663'danielsdeleo2012-12-052-2/+34
|\ \ \ | |/ / |/| |
| * | [CHEF-3663] Search for .chef in ENV[PWD] if setdanielsdeleo2012-12-052-2/+34
|/ / | | | | | | | | | | Prefer ENV["PWD"] for current working dir, but fall back to Dir.pwd if not set. Fixes config path searching when part of the path hierarchy is a symlinked directory.
View Lorry Controller Status