diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-02 14:43:15 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-02 14:43:15 -0800 |
| commit | dac675c94e6ed1ee67a3081ba7379e000ee93c1c (patch) | |
| tree | d01241c30e679ebf8c7a6be0d907ed3eda523584 /ext | |
| parent | 022114d8e50b1adb785b38262251979a222e7972 (diff) | |
| parent | af6e08c0a59db951502d0cf8c0ca24f5001e92f1 (diff) | |
| download | puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.tar.gz puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.tar.xz puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.zip | |
Merge branch '2.6.x' into next
* 2.6.x:
(#5304) Use internal_name rather than real_name for maillist provider
Updated CHANGELOG and version for 2.6.4
Revert "(#5304) Use internal_name rather than real_name for maillist provider"
Disable remote ralsh by default
(#5424) Ship auth.conf as part of installing from source
(#5304) Use internal_name rather than real_name for maillist provider
Renamed Reductive to Puppet
Manually Resolved Conflicts:
lib/puppet/provider/maillist/mailman.rb
Diffstat (limited to 'ext')
| -rwxr-xr-x | ext/nagios/naggen | 2 | ||||
| -rwxr-xr-x | ext/puppet-test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/nagios/naggen b/ext/nagios/naggen index a9e04c47a..c6ca15a55 100755 --- a/ext/nagios/naggen +++ b/ext/nagios/naggen @@ -63,7 +63,7 @@ # # = Copyright # -# Copyright (c) 2009 Reductive Labs, LLC +# Copyright (c) 2009 Puppet Labs, LLC # Licensed under the GPL 2 require 'puppet' diff --git a/ext/puppet-test b/ext/puppet-test index 61397e74b..f2648c9ee 100755 --- a/ext/puppet-test +++ b/ext/puppet-test @@ -90,7 +90,7 @@ # # = Copyright # -# Copyright (c) 2005, 2006 Reductive Labs, LLC +# Copyright (c) 2005, 2006 Puppet Labs, LLC # Licensed under the GNU Public License # Do an initial trap, so that cancels don't get a stack trace. |