Merge branch 'master' into 11-stable

1 files changed, 12 insertions, 11 deletions

diff --git a/lib/chef/resource/log.rb b/lib/chef/resource/log.rb
index 30a5bb93c6..391c3b5393 100644
--- a/lib/chef/resource/log.rb
+++ b/lib/chef/resource/log.rb
@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
 class Chef
   class Resource
     class Log < Chef::Resource
-    
+
       identity_attr :message
 
       # Sends a string from a recipe to a log provider
@@ -27,16 +27,16 @@ class Chef
       # log "some string to log" do
       #   level :info  # (default)  also supports :warn, :debug, and :error
       # end
-      #    
+      #
       # === Example
-      # log "your string to log" 
+      # log "your string to log"
       #
-      # or 
+      # or
       #
       # log "a debug string" { level :debug }
       #
-  
-      # Initialize log resource with a name as the string to log 
+
+      # Initialize log resource with a name as the string to log
       #
       # === Parameters
       # name<String>:: Message to log
@@ -47,6 +47,7 @@ class Chef
         @resource_name = :log
         @level = :info
         @action = :write
+        @allowed_actions.push(:write)
         @message = name
       end
 
@@ -57,7 +58,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
       # <Symbol> Log level, one of :debug, :info, :warn, :error or :fatal
       def level(arg=nil)
         set_or_return(
@@ -66,9 +67,9 @@ class Chef
           :equal_to => [ :debug, :info, :warn, :error, :fatal ]
         )
       end
-    
+
     end
-  end  
+  end
 end