diff options
| author | Thom May <thom@may.lt> | 2015-12-08 18:53:14 +0000 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2015-12-08 18:53:14 +0000 |
| commit | 1796116864c91ce68661df7a98c3a8c9f355d56f (patch) | |
| tree | 0420d6862e665d150d84945da4ad35071155ea58 /lib/chef/provider | |
| parent | d67fed62695c70a059fc815e4cafcbbee015126d (diff) | |
| parent | 2c8d90c0eea2b014aba1699c677d9d42c850746b (diff) | |
| download | chef-1796116864c91ce68661df7a98c3a8c9f355d56f.tar.gz | |
Merge pull request #4236 from chef/jdm/dsc_resource_timeout
Add timeout attribute to dsc_resource
Diffstat (limited to 'lib/chef/provider')
| -rw-r--r-- | lib/chef/provider/dsc_resource.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb index efbe4eccef..fd25a14ea5 100644 --- a/lib/chef/provider/dsc_resource.rb +++ b/lib/chef/provider/dsc_resource.rb @@ -154,7 +154,7 @@ class Chef "Invoke-DscResource #{switches}", output_format ) - cmdlet.run! + cmdlet.run!({}, {:timeout => new_resource.timeout}) end def return_dsc_resource_result(result, property_name) |