Skip to content
Commits on Aug 19, 2013
Commits on Aug 15, 2013
  1. @haus

    Merge remote-tracking branch 'origin/stable'

    haus committed Aug 15, 2013
    * origin/stable:
      (Bug #22164) remove hardcoded hostname dependencies
  2. @haus

    Merge pull request #1836 from melissaanne/maint/stable/re-144_rm-hard…

    haus committed Aug 15, 2013
    …coded-dependencies
    
    (Bug #22164) remove hardcoded hostname dependencies
  3. @jpartlow

    Merge branch 'stable'

    jpartlow committed Aug 15, 2013
    * stable: (21 commits)
      (packaging) Update PUPPETVERSION for 3.2.4
      (maint) Correct type in speeeeling of pl-fedora-18-i386 mock in ext/build_defaults.yaml
      (packaging) Move systemd BuildRequires into conditional
      (Bug #21768) Update puppet for F19
      (maint) Remove rspec requires from the Rakefile
      (maint) Fix module_utils regex tests for module file perms
      (maint) Fix windows test for embedded '..' in path
      Improving testing around PMT module install permissions.
      Ensure that PMT uses the correct group membership.
      (#21971) Allow paths that contain .. as part of a name
      Fixing a missed test for minitar.
      (Maint) Reinstate check for manifest dir
      (#21953) Add test to verify module permissions
      (#14333) Ensure module permissions are sane.
      (#21971) Fixes PathPattern's usage of Dir.glob for Windows
      (#21971) Fix TypeLoader#import_all on Ruby 1.8.7
      (#21971) Create system for safely dealing with path patterns
      (#21971) Split import and autoloading code paths
      (#21971) Check for possible directory traversal
      (Maint) Clean up specs
      ...
  4. @jpartlow

    Merge branch 'release_3.2.4' into stable

    jpartlow committed Aug 15, 2013
    3.2.4
    
    * tag '3.2.4': (21 commits)
      (packaging) Update PUPPETVERSION for 3.2.4
      (maint) Correct type in speeeeling of pl-fedora-18-i386 mock in ext/build_defaults.yaml
      (packaging) Move systemd BuildRequires into conditional
      (Bug #21768) Update puppet for F19
      (maint) Remove rspec requires from the Rakefile
      (maint) Fix module_utils regex tests for module file perms
      (maint) Fix windows test for embedded '..' in path
      Improving testing around PMT module install permissions.
      Ensure that PMT uses the correct group membership.
      (#21971) Allow paths that contain .. as part of a name
      Fixing a missed test for minitar.
      (Maint) Reinstate check for manifest dir
      (#21953) Add test to verify module permissions
      (#14333) Ensure module permissions are sane.
      (#21971) Fixes PathPattern's usage of Dir.glob for Windows
      (#21971) Fix TypeLoader#import_all on Ruby 1.8.7
      (#21971) Create system for safely dealing with path patterns
      (#21971) Split import and autoloading code paths
      (#21971) Check for possible directory traversal
      (Maint) Clean up specs
      ...
    
    Conflicts:
    	lib/puppet/parser/type_loader.rb
    	spec/unit/parser/type_loader_spec.rb
    
    Conflicts were between changes Patrick Carlisle made in stable between
    3.2.3..3331528, mostly refactoring the type_loader_spec to be
    independent of parser implementation:
    
    * 0c6060f Patrick Carlisle 5 weeks ago (maint) Refactor type_loader,
     mostly specs
    * 27a69f2 Patrick Carlisle 5 weeks ago (#21653) Skip modules with no
     manifest directory when loading resource types
    
    And the above security work.
  5. @adrienthebo

    Merge pull request #1816 from jasperla/openbsd/install_options

    adrienthebo committed Aug 15, 2013
    (#22021) Implement (un)install_options for OpenBSD package provider.
  6. @haus
  7. @haus

    Merge branch '2.7.x' into stable

    haus committed Aug 15, 2013
  8. @haus

    Merge tag '2.7.23' into 2.7.x

    haus committed Aug 15, 2013
    2.7.23
  9. @adrienthebo

    Merge remote-tracking branch 'jeffmccune/ccaviness-6017-mcx-should-ov…

    adrienthebo committed Aug 15, 2013
    …erwrite-existing-data'
    
    This closes GH-1796
  10. @adrienthebo

    Merge pull request #1829 from dalen/21170_skeleton_dir

    adrienthebo committed Aug 14, 2013
    (#21170) Allow specifying module tool skeleton dir directly
Commits on Aug 14, 2013
  1. @haus
  2. @haus

    (maint) Correct type in speeeeling of pl-fedora-18-i386 mock in ext/b…

    haus committed Jul 19, 2013
    …uild_defaults.yaml
  3. @haus

    (packaging) Move systemd BuildRequires into conditional

    haus committed Jul 19, 2013
    Previously either systemd or systemd-units were BuildRequires on all rpms.
    These packages are not available on el5 or el6, which would break rpm building
    on those platforms. This commit moves those BuildRequires into an already
    existing systemd conditional, so they are only required on systems that support
    systemd.
  4. @haus

    (Bug #21768) Update puppet for F19

    Melissa Stone committed with haus Jul 16, 2013
    Prior to this commit, there was no support for Fedora 19. This
    commit modifies build_defaults to include F19 in the mocks,
    and removes the ruby(abi) requirement. This is because F19 no
    longer provides ruby abi.
  5. @haus

    (maint) Remove rspec requires from the Rakefile

    haus committed Jul 31, 2013
    In the Rakefile, we no longer use Rspec methods or classes, but instead shell
    out to rspec, so requiring rspec serves no purpose in the rakefile. The require
    was also incorrectly placed within an unrelated begin/rescue block, which
    caused deprecated rake libraries to be loaded when rspec was not present. This
    commit removes it from the Rakefile.
  6. @jasperla
  7. @pcarlisle

    Merge pull request #1838 from zaphod42/feature/master/18508-handle-ge…

    pcarlisle committed Aug 13, 2013
    …nerated-resources-on-agent
    
    (#18508) Ensure eval_generated resources apply at the right time
  8. @zaphod42

    (Maint) Move most graph related code to Puppet::Graph

    zaphod42 committed Aug 13, 2013
    We often talk about "the graph", but until now there hasn't been a clear
    graph that we were talking about. The relationship graph that is used
    for evaluation is the best candidate to fill this role, since it
    contains all of the ordering information that is needed.
    
    This also removes Puppet::Util::Graph, which was unused.
  9. @zaphod42

    (#18508) Ensure that no two resources have the same priority

    zaphod42 committed Aug 13, 2013
    The underlying red-black tree that is used as the priority queue for
    tracking what resources to evaluate will only allow a single value per
    key. This means that when generated resources are added they need to get
    unique priority keys. However there could be an arbitrary number of
    these resources added in between existing resources. This commit
    provides a Puppet::Graph::Key that behaves like the numbering scheme of
    an outline so that priorities can be arbitrarily nested and the nested
    priorities are between the priorities at the outer level.
    
    The integration tests for the file type caught this error. It only
    showed up when 2 unique, new resources are generated.
  10. @zaphod42

    (#18508) Handle duplicate generated resources correctly

    zaphod42 committed Aug 13, 2013
    When a generated resource duplicates a resource already in the catalog,
    we want to avoid adding it a second time, but we still want to create
    dependencies between the resource and the generating resource. For
    example, we may have a recursive file resource, but explicitly model one
    of the files that will be generated. We still want the explicit file
    resource to depend on its generated parent directory.
    
    This also refactors the resource generation methods, splitting them up
    into smaller methods.
  11. @zaphod42

    (#18508) Ensure eval_generated resources apply at the right time

    zaphod42 committed Aug 12, 2013
    Resources created with eval_generate need to apply with the same
    priority as their parent resource.
  12. @zaphod42

    (#18508) Extract class to control generating resources

    zaphod42 committed Aug 12, 2013
    The logic for determining how to add generated resources into the
    catalog was tightly bound with the rest of the transaction code. This
    makes it hard to test the exact logic around that. By extracting a class
    it exposes that logic in a much more testable form.
Commits on Aug 13, 2013
  1. @melissa

    (Bug #22164) remove hardcoded hostname dependencies

    melissa committed Aug 13, 2013
    Prior to this commit, burji.puppetlabs.com was hardcoded in different
    points of puppet. Since we're in the process of migrating off burji and
    onto burji2, we realized this probably is not a good thing to have in
    place. This commit removes that hardcoded dependency on burji.
  2. @zaphod42

    Merge pull request #1837 from jpartlow/issue/master/22128-yum-prefetc…

    zaphod42 committed Aug 13, 2013
    …h-failure-solaris-spec-fix
    
    (#22128) Yum prefetch spec ensures use of yum provider
  3. @jpartlow

    (#22128) Yum prefetch spec ensures use of yum provider

    jpartlow committed Aug 13, 2013
    The prefetch spec for the Yum package provider was failing on platforms
    whose default providers did not have the same capabilities (definitely
    on Windows for msi), because the previous implementation was generating type
    instances of Puppet::Type::Package without setting their providers.
    Consequently these instances were being generated with references to the
    platform's default providers, and might fail to set :ensure =>
    :latest due to missing capabilities.
    
    The spec is changed to associate instances of yum providers with the
    package type instances being passed into prefetch.  Also removed the
    confine for Windows.
    
    This also clears up a typo that got through in the original patch, which
    was failing on only some platforms.
  4. @adrienthebo

    Merge pull request #1835 from zaphod42/maint/master/fix-path-on-windows

    adrienthebo committed Aug 13, 2013
    (Maint) Fix testing path on windows
  5. @zaphod42

    (Maint) Fix testing path on windows

    zaphod42 committed Aug 13, 2013
    A file resource needs to have absolute paths, but a drive relative path
    doesn't qualify as an absolute path on windows. This fixes the path used
    for testing to be "absolutized" before use.
  6. @ccaviness @jeffmccune

    (#6017) Purge MCX data before import

    ccaviness committed with jeffmccune Jul 22, 2013
    Without this patch settings linger in the MCX system because old
    settings are not always overwritten by the data import.  This patch
    addresses the problem by purging all MCX data prior to the import.
Commits on Aug 12, 2013
  1. @jpartlow

    Merge pull request #1834 from jpartlow/issue/master/22128-yum-prefetc…

    jpartlow committed Aug 12, 2013
    …h-failure-spec-confined-on-windows
    
    (#22128) Confine yum provider prefetch spec from running on windows
  2. @jpartlow

    (#22128) Confine yum provider prefetch spec from running on windows

    jpartlow committed Aug 12, 2013
    The new yum prefetch spec was failing on windows:
    
    Puppet::Type::Package::ProviderYum prefetching injects latest provider
    info into passed resources when prefetching
        Failure/Error: myresource = package_type.new(:name => "myresource",
    :ensure => :latest)
        Puppet::ResourceError:
          Parameter ensure failed on Package[myresource]: Provider must have
    features 'upgradeable' to set 'ensure' to 'latest'
    
    possibly because the windows default package provider does not provide
    the same features.  Since this test is specific to yum, confining it from
    running on windows.
  3. @zaphod42

    (#18508) Create explicit dependencies before implicit

    zaphod42 committed Aug 12, 2013
    All of the explicit dependencies need to be added before any of the
    implicit (autorequire) dependencies are processed. This is because we
    skip an implicit dependency if it would interfere with an expicit one,
    and if we don't have all of the explicit dependencies available the
    system will end up creating implict ones that cause dependency cycles.
  4. @adrienthebo

    Merge branch 'stable'

    adrienthebo committed Aug 12, 2013
    Conflicts:
    	lib/puppet/resource/type_collection.rb
  5. @zaphod42

    Merge pull request #1833 from jpartlow/issue/master/22128-yum-prefetc…

    zaphod42 committed Aug 12, 2013
    …h-failure
    
    Issue/master/22128 yum prefetch failure
  6. @adrienthebo

    Merge pull request #1820 from Sharpie/21835-silence-ignoremissingtypes

    adrienthebo committed Aug 12, 2013
    (#21835) Remove missing type optimization warning
Something went wrong with that request. Please try again.