Commits on Aug 12, 2010
  1. Merge branch 'next'

    This synchronizes the 2.7 master branch with 2.6.1RC2
    jes5199 committed Aug 12, 2010
  2. Updated for 2.6.1rc2

    jamtur01 committed Aug 12, 2010
  3. Updated all types to Markdown output

    Updated defaults.rb to Markdown
    Migrated report documentation to Markdown
    Migrated Naginator doco to Markdown
    Updated provider documentation to Markdown
    jamtur01 committed with MarkusQ Aug 11, 2010
  4. Reformatting documentation from RST to MarkDown (#4509)

    Signed-off-by: Jes Fraser <>
    canllaith committed with MarkusQ Aug 11, 2010
  5. Removed legacy Trac code

    jamtur01 committed with MarkusQ Aug 11, 2010
Commits on Aug 6, 2010
  1. Maint. Passenger fix broke a test

    The content-length fix for passenger broke a test; this fixes it.
    MarkusQ committed Aug 6, 2010
  2. Fix for #4476 -- rails calling yaml internals

    Some recent versions of rails have started calling yaml with the internal
    (and IIRC depricated) signature; this does nothing special in yaml but it
    breaks with zaml, so we add an ignored parameter to simulate the non-behavior.
    *sigh*  I love rails.
    MarkusQ committed Aug 6, 2010
  3. Fixes #4485 -- single quoted strings should not treat \n as new line

    This is the rest of the change for #4303; James and I discussed various
    ways the solution to that ticket needed to be extended but, as neither of us
    committed code, nothing changed.  This is the least implact extension, which
    mimics the behaviour of prior versions.
    It leaves open the question: should '\\x' start with a single or double
    backslash?  If, as now, '\\x' starts with a double backslash (i.e. single quote
    is the only escapable characterin single quoted strings) a string ending in a
    backslash can not be represented in a single quoted string.
    MarkusQ committed Aug 6, 2010
Commits on Aug 5, 2010
  1. Passenger needs HTTP headers values to be string

    When streaming a file through rack, we set the Content-Length header
    to be the size of the transmitted file.
    This size is an int, and recent passenger versions only support string
    Signed-off-by: Brice Figureau <>
    masterzen committed with MarkusQ Aug 4, 2010
  2. [#4404] Remove requirement for source on Parser::Resource::Param

    Stage[main] is created without an associated source, to which
    Parser::Resource::Param objects. This patch observes that the source
    attribute of both Parser::Resource and Parser::Resource::Param seem
    not to be used anywhere, and removes the requirement that it be
    nicklewis committed with MarkusQ Aug 4, 2010
  3. [#4364] Fix failing spec due to incorrect loglevel

    A spec was failing since it wasn't updated when the #4364 change was
    jes5199 committed with MarkusQ Aug 4, 2010
  4. Fix #4458 - Do not dump the whole environment when instances can't be…

    … found
    When generating the error message when we can't find any instances for a
    search request, we were "inspect"ing the request which now contains
    an environment instance which itself contains a lots of things (including
    all the known resource types).
    Thus it was generating a very large "reason" (ie the HTTP error string).
    On some environments (ie proxied mongrel) this was too large and the
    proxy would produce an error 500.
    I just changed the error message to just log the indirection name and
    request key (which should be enough to understand what is wrong).
    Signed-off-by: Brice Figureau <>
    masterzen committed with MarkusQ Aug 4, 2010
  5. Fix for #4465 -- earlier "feature" patch broke ldap

    The patch for #3904 should not have been accepted; it's buggy and the use case
    (supporting having nodes in ldap more than once with the same name but distinct
    records) is ill-conceived.
    This commit reverts the patch (a7884b4) and the previous attempt to fix it
    (e6709da), restoring the old (0.25.x) behaviour.
    MarkusQ committed Aug 4, 2010
  6. Maint -- tests need to respect RFC-952

    We had a test that assumed hostnames would only consist of letters; by RFC-952
    they are also allowed to contain digits and '-'s.  The test failed on such
    MarkusQ committed Aug 4, 2010
  7. [#4467] Make Puppet Master respect facts_terminus settings

    * Remove hard-coded facts terminus in master
    * Change facts_terminus default to 'yaml' for master and 'facter' for
      everything else.
    Paired-with: Matt Robinson <>
    Signed-off-by: Rein Henrichs <>
    Rein Henrichs committed with MarkusQ Aug 4, 2010
Commits on Aug 3, 2010
  1. [#4381] extlookup shouldn't trigger reparses of .pp files

    extlookup was adding its data files to the list of watched source files.
    This causes the .pp manifests to be re-parsed whenever the .csv files
    change, which is no longer necessary, as the .csv files are already
    reparsed on every function call.
    jes5199 committed with markus Jul 27, 2010
  2. [#4370] Fixes extlookup precedence getting overwritten between runs

    We found the gsub! in extlookup was actually modifying the value for
    extlookup_precedence, so the next node to call it just got the
    interpolated value from the first run.
    We did two things in the code to prevent this:
    1. We returned a dup of the ast string object so that modifying it
    wouldn’t change puppet’s state. We didn’t do this for all possible
    return values because we depend on using the original ast array object
    to do array concatenation
    2. We fixed extlookup to not do a destructive gsub
    Reviewed by: Jesse Wolfe
    Matt Robinson committed with markus Jul 27, 2010
  3. [#4347] run_mode was colliding with --mode for "puppet doc"

    The run_mode value was incorrectly getting stored to Puppet[:mode], which
    was confusing the optparser for applications that declare a --mode
    jes5199 committed with markus Jul 27, 2010
  4. [#4423] repair parameterized class instantiation

    My earlier #4397 patch was not aware of the parameterized class
    instantiation syntax, and failed on manifests that instantiate
    parameterized classes.
    jes5199 committed with markus Aug 3, 2010
  5. [#4423] class { shouldn't get stored on the namespace stack

    The new syntax for instantiating parameterized classes was confusing the
    lexer's notion of namespaces.
    This is a simple fix to prevent that syntax from polluting the
    jes5199 committed with markus Aug 3, 2010
  6. [#4397]+[#4344] Move type-name resolution out of Puppet::Resource int…

    …o the AST resources.
    Move type-name resolution out of Puppet::Resource into the AST resources.
    Move find_resource_type out of Puppet::Resource into Scope
    Thus, never pass unqualified type names to Puppet::Resource objects.
    Thus, Puppet::Resource objects don't need the namespace property,
    and Puppet::Resource objects never consult the harddrive to look for
    .pp files that might contain their type definitions,
    Thus, performance is improved.
    Also removes the temporary fix for #4257 that caused #4397
    (The code was too eager to look for a class in the topscope)
    Paired-With: Paul Berry <>
    Signed-off-by: Jesse Wolfe <>
    jes5199 committed with markus Jul 28, 2010
  7. [#4344] Temporary fix to stop agent from importing modules

    Due to type collection madness, agent tries to import modules
    to resolve resource types. That is wrong, decreases performance,
    and causes problems. This patch forces agent to not import any
    files by setting ignoreimport to true.
    nicklewis committed with markus Jul 27, 2010
  8. [#4344] Fix for failing templates when module name matches file in lo…

    …cal dir.
    When the name of a module matches the name of a file in the local
    directory, puppet agent would sometimes try to read that file and
    interpret it as puppet code.  This happened because files.rb was
    unintentionally permitting puppet files without an extension.  Fixed
    by changing the glob pattern to only permit ".pp" and ".rb"
    Paul Berry committed with markus Jul 27, 2010
  9. [#4336] "reportdir" was in the wrong section

    Correctly revert damage done by c00285c, which incorrectly reverted in
    The result was that "puppet agent" and others were trying to create a
    reportdir that they don't actually use.
    jes5199 committed with markus Jul 27, 2010
  10. Fixed #4311 - Typo in defaults.rb

    jamtur01 committed with markus Jul 24, 2010
  11. Fix #4461 - attempt to fix another performance issue

    During a profiling of a 2.6.1rc1 puppet master, I found that we
    spend a lot of time and efforts in Puppet::Util::Autoload#module_directories.
    Since this method is doing a bunch of filesystem access, this process is
    In fact each time we were evaluating a resource or trying to find if a given
    resource was a builtin type we ended up scanning the whole module directories
    for the given environment.
    This patch attempts to fix this performance issue by caching the module_directories
    output for the either the time of the compilation or an agent configurer
    run (since this stuff looks like to be shared for both compilation and
    catalog evaluation).
    With this patch, my compilation time for 2k resources went from 5.91s to
    3.71s (second run each time to allievate parsing time)..
    Signed-off-by: Brice Figureau <>
    Edited to fix a typo [#4434]
    Signed-off-by: Jesse Wolfe <>
    masterzen committed with markus Jul 30, 2010
  12. Fix for #4300 Solaris svc files need new pid filenames

    The conf/solaris/smf/svc-puppetd and svc-puppetmasterd still used and for stopping the services in 2.6.0.
    These are changed to and for 2.6.1.
    markus committed Aug 3, 2010
  13. [#4284] Fix failing specs run as root due to missing puppet group

    These specs 'use' some settings which create directories belonging
    to the 'service' user/group. If the default service group doesn't
    exist, these fail. This patch explicitly sets the service group to
    the gid of the process, which is known to be accessible by the user.
    nicklewis committed with markus Jul 28, 2010
  14. [#4242] Fixed (removed) a broken unit test

    This test ran into a mocha bug, and was stubbing too much anyway.
    It's being moved to an acceptance test.
    nicklewis committed with markus Jul 26, 2010