[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 7c59acfaefff3a69d67af8a65490e36175965168
Author: Markus Roberts <Markus at reality.com>
Date:   Tue May 4 15:57:08 2010 -0700

    Renamed all references to Reductive Labs to Puppet Labs
    
    Find and replace to the rescue...

diff --git a/ext/yaml_nodes.rb b/ext/yaml_nodes.rb
index 4715b16..107e57a 100755
--- a/ext/yaml_nodes.rb
+++ b/ext/yaml_nodes.rb
@@ -29,7 +29,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2009 Reductive Labs, Inc.
+# Copyright (c) 2009 Puppet Labs, Inc.
 # Licensed under the GPL2
 
 require 'yaml'
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
index 39c2911..47d85da 100755
--- a/lib/puppet/type/exec.rb
+++ b/lib/puppet/type/exec.rb
@@ -52,7 +52,7 @@ module Puppet
             in the short term, it is highly recommended to migrate work from ``exec``
             to native Puppet types as quickly as possible.  If you find that
             you are doing a lot of work with ``exec``, please at least notify
-            us at Reductive Labs what you are doing, and hopefully we can work with
+            us at Puppet Labs what you are doing, and hopefully we can work with
             you to get a native resource type for the work you are doing."
 
         require 'open3'
diff --git a/lib/puppet/type/file.rb b/lib/puppet/type/file.rb
index 5b41538..67bba5c 100644
--- a/lib/puppet/type/file.rb
+++ b/lib/puppet/type/file.rb
@@ -21,7 +21,7 @@ Puppet::Type.newtype(:file) do
 
         If you find that you are often copying files in from a central
         location, rather than using native resources, please contact
-        Reductive Labs and we can hopefully work with you to develop a
+        Puppet Labs and we can hopefully work with you to develop a
         native resource to support what you are doing."
 
     newparam(:path) do
diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index 2c4605f..de63fc3 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.rb
@@ -126,7 +126,7 @@ class TestCertMgr < Test::Unit::TestCase
                 :city => "Nashville",
                 :country => "US",
                 :email => "luke at madstop.com",
-                :org => "Reductive",
+                :org => "Puppet",
                 :ou => "Development",
                 :encrypt => mkPassFile()
             )

-- 
Puppet packaging for Debian