diff options
author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-08 13:41:48 -0800 |
---|---|---|
committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-08 13:41:48 -0800 |
commit | 2092e61264899c742924a30148ebe1e079b60d38 (patch) | |
tree | eee76afe656ac7b9443b5356fe673fd3cac25789 /lib/puppet/util/rdoc/code_objects.rb | |
parent | 4a8c631a5f909c3e482e087f88cf618e1b44ee4e (diff) | |
parent | 64440e58967667426e7294ed38ad16e19812d8c4 (diff) | |
download | puppet-2092e61264899c742924a30148ebe1e079b60d38.tar.gz puppet-2092e61264899c742924a30148ebe1e079b60d38.tar.xz puppet-2092e61264899c742924a30148ebe1e079b60d38.zip |
Merge branch 'ticket/2.6.x/6513-propigate-environment-in-settings-values' into 2.6.next
* ticket/2.6.x/6513-propigate-environment-in-settings-values:
(#6513) Propagate the environment when doing variable lookup in settings
(#6513) Adjust P::U::Settings test name to reflect what it tests
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions