Merging the state-rename branch. This includes the diff from version 2156 to 2168. All states should now be properties, with backward compatibility for the types that restricted themselves to the methods.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2169 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/puppet/server/fileserver.rb b/lib/puppet/server/fileserver.rb
index 2b91c8811..b541f2474 100755
--- a/lib/puppet/server/fileserver.rb
+++ b/lib/puppet/server/fileserver.rb
@@ -43,14 +43,14 @@ class Server
 
             desc = []
             CHECKPARAMS.each { |check|
-                if state = obj.state(check)
-                    unless state.is
+                if property = obj.property(check)
+                    unless property.is
                         mount.debug "Manually retrieving info for %s" % check
-                        state.retrieve
+                        property.retrieve
                     end
-                    desc << state.is
+                    desc << property.is
                 else
-                    if check == "checksum" and obj.state(:type).is == "file"
+                    if check == "checksum" and obj.property(:type).is == "file"
                         mount.notice "File %s does not have data for %s" %
                             [obj.name, check]
                     end
diff --git a/lib/puppet/server/resource.rb b/lib/puppet/server/resource.rb
index 12a188a18..d2bad52f3 100755
--- a/lib/puppet/server/resource.rb
+++ b/lib/puppet/server/resource.rb
@@ -49,7 +49,7 @@ class Server::Resource < Server::Handler
         return "success"
     end
 
-    # Describe a given object.  This returns the 'is' values for every state
+    # Describe a given object.  This returns the 'is' values for every property
     # available on the object type.
     def describe(type, name, retrieve = nil, ignore = [], format = "yaml", client = nil, clientip = nil)
         Puppet.info "Describing %s[%s]" % [type.to_s.capitalize, name]