Merge branch 'integrate-chef-10-18-0'

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/chef/resource/log.rb b/lib/chef/resource/log.rb
index d1b6b5af0b..30a5bb93c6 100644
--- a/lib/chef/resource/log.rb
+++ b/lib/chef/resource/log.rb
@@ -20,7 +20,7 @@ class Chef
   class Resource
     class Log < Chef::Resource
     
-      identity_attr :name
+      identity_attr :message
 
       # Sends a string from a recipe to a log provider
       #
@@ -47,6 +47,15 @@ class Chef
         @resource_name = :log
         @level = :info
         @action = :write
+        @message = name
+      end
+
+      def message(arg=nil)
+        set_or_return(
+          :message,
+          arg,
+          :kind_of => String
+        )
       end
       
       # <Symbol> Log level, one of :debug, :info, :warn, :error or :fatal