diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-17 15:19:15 -0800 |
| commit | e6ec6468c4a9eec58dc155858665a70eee4dfb8c (patch) | |
| tree | 85cdb7614a1922752ff652b93f2947ef231fa8fb /lib/puppet/node | |
| parent | fb2b9e65990477e81728402afa1aab6fbe4a9c7e (diff) | |
| parent | 53bb805f118ccaca5598e60afadfa6b777410a0f (diff) | |
| download | puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.gz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.tar.xz puppet-e6ec6468c4a9eec58dc155858665a70eee4dfb8c.zip | |
Merge commit '2.6.3' into next
Resolved conflicts manually:
spec/integration/indirector/bucket_file/rest_spec.rb
spec/integration/indirector/certificate_revocation_list/rest_spec.rb
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/environment.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index 3d55ac1a0..7877b7f73 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -124,6 +124,10 @@ class Puppet::Node::Environment name.to_s end + def to_sym + to_s.to_sym + end + # The only thing we care about when serializing an environment is its # identity; everything else is ephemeral and should not be stored or # transmitted. |