[Puppet-dev] [PATCH/puppet 1/1] [#4006] Fix test failures caused by reverting ticket 2890

2010-06-15 Thread Matt Robinson
When Markus reverted changes made by 2890 he reintroduced a method certificate_matches_key? that then caused failures in network/xmlrpc/client.rb. I just stubbed that method to return true since the failing tests weren't trying to test that methods behavior. Reviewed-by: Markus Roberts Signed-of

[Puppet-dev] [PATCH/puppet 1/1] Fixes #3395 - CR+LF line endings in manifests cause syntax error

2010-06-15 Thread James Turnbull
Thanks to Alan Barrett for the patch Signed-off-by: James Turnbull --- lib/puppet/parser/lexer.rb |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb index 7adb0b6..cc0b0bc 100644 --- a/lib/puppet/parser/lexer.rb +++ b

[Puppet-dev] [PATCH/puppet 1/1] Fixes #3514 - CR/LF line ending in puppet.conf cause silent failure

2010-06-15 Thread James Turnbull
Patch thanks to Alan Barrett Signed-off-by: James Turnbull --- lib/puppet/util/settings.rb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb index b2d1f4a..b567f76 100644 --- a/lib/puppet/util/settings.rb +++ b/l

Re: [Puppet-dev] [PATCH/puppet 1/1] Part 2 of fix for #1175 (functions in environments)

2010-06-15 Thread Markus Roberts
> >>> P.S. Personally, I think stripping out all pretense of handling > >>> multiple environments in a single process is the way to go, but I > >>> understand the concerns that make that an unpopular direction. > > > >> Tell it to the users. :/ > > > > Speaking as a user, I don't much care if it i

Re: [Puppet-dev] [PATCH/puppet 1/1] Part 2 of fix for #1175 (functions in environments)

2010-06-15 Thread Nigel Kersten
On Tue, Jun 15, 2010 at 1:18 AM, Thomas Bellman wrote: > On 2010-06-15 08:57, Luke Kanies wrote: > >> On Jun 14, 2010, at 10:53 AM, Markus Roberts wrote: > >>> P.S. Personally, I think stripping out all pretense of handling >>> multiple environments in a single process is the way to go, but I >>>

Re: [Puppet-dev] [PATCH/puppet 1/1] Part 2 of fix for #1175 (functions in environments)

2010-06-15 Thread Thomas Bellman
On 2010-06-15 08:57, Luke Kanies wrote: On Jun 14, 2010, at 10:53 AM, Markus Roberts wrote: P.S. Personally, I think stripping out all pretense of handling multiple environments in a single process is the way to go, but I understand the concerns that make that an unpopular direction. Tell