diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-12-13 17:18:46 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2010-12-13 17:18:46 -0800 |
| commit | 167e84d39d5cdd6b628d4d681b918406e7c896e6 (patch) | |
| tree | 56f0e4eb1798d0b8a1f5c37bae8ff2cf34171d85 /lib | |
| parent | dcccdc1d7f31b92f73c9a106960a373a009c1a5b (diff) | |
| parent | 7f4e058133a0aa6b07bd3402cf01009818066d32 (diff) | |
| download | puppet-167e84d39d5cdd6b628d4d681b918406e7c896e6.tar.gz puppet-167e84d39d5cdd6b628d4d681b918406e7c896e6.tar.xz puppet-167e84d39d5cdd6b628d4d681b918406e7c896e6.zip | |
Merge branch 'ticket/2.6.next/4487' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector/catalog/active_record.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/indirector/catalog/active_record.rb b/lib/puppet/indirector/catalog/active_record.rb index fabb08eb9..f814f4aff 100644 --- a/lib/puppet/indirector/catalog/active_record.rb +++ b/lib/puppet/indirector/catalog/active_record.rb @@ -32,7 +32,7 @@ class Puppet::Resource::Catalog::ActiveRecord < Puppet::Indirector::ActiveRecord if node = Puppet::Node.find(catalog.name) host.ip = node.parameters["ipaddress"] - host.environment = node.environment + host.environment = node.environment.to_s end host.save |