diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-03-09 16:38:37 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-03-09 16:38:37 -0700 |
| commit | 4b0f63b90cc72365fccd3f4f2e07721de7af80e6 (patch) | |
| tree | 80f8967d7a3524373e91b3c0dc24638bcca4c613 /lib/chef/resource | |
| parent | b023ada18ed90bb9d2545760f93e6210e083dc8d (diff) | |
| parent | 4d788061acc5b4b935bce43f45bc150b0e1c7707 (diff) | |
| download | chef-4b0f63b90cc72365fccd3f4f2e07721de7af80e6.tar.gz | |
Merge pull request #3004 from chef/lcg/deploy-provider-nillable
add specs for nilling deploy parameters
Diffstat (limited to 'lib/chef/resource')
| -rw-r--r-- | lib/chef/resource/deploy.rb | 3 | ||||
| -rw-r--r-- | lib/chef/resource/git.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/resource/deploy.rb b/lib/chef/resource/deploy.rb index f886f856df..fade82a972 100644 --- a/lib/chef/resource/deploy.rb +++ b/lib/chef/resource/deploy.rb @@ -63,6 +63,7 @@ class Chef @deploy_to = name @environment = nil @repository_cache = 'cached-copy' + # XXX: if copy_exclude is a kind_of String why is initialized to an array??? @copy_exclude = [] @purge_before_symlink = %w{log tmp/pids public/system} @create_dirs_before_symlink = %w{tmp public config} @@ -78,7 +79,7 @@ class Chef @scm_provider = Chef::Provider::Git @svn_force_export = false @allowed_actions.push(:force_deploy, :deploy, :rollback) - @additional_remotes = Hash[] + @additional_remotes = {} @keep_releases = 5 @enable_checkout = true @checkout_branch = "deploy" diff --git a/lib/chef/resource/git.rb b/lib/chef/resource/git.rb index 7156873315..306efe633d 100644 --- a/lib/chef/resource/git.rb +++ b/lib/chef/resource/git.rb @@ -27,7 +27,7 @@ class Chef def initialize(name, run_context=nil) super @resource_name = :git - @additional_remotes = Hash[] + @additional_remotes = {} end def additional_remotes(arg=nil) |