Skip to content
Commits on Aug 30, 2012
  1. @haus

    Merge branch '1.x'

    haus committed
  2. @haus

    Merge branch '1.0rc' into 1.x

    haus committed
  3. @haus

    Add json backend to hiera.

    haus committed
    This commit brings the json backend and corresponding spec test from hiera-json
    into hiera. The spec test has been updated to move some of its requires into the
    spec_helper in a previous commit. This commit also updates the project_data.yaml
    to add a json dependency to hiera to the gem, deb and rpm packages.
  4. @haus

    Refactor specs, remove spec.opts

    haus committed
    This moves many of the requires used in the specs for hiera into the
    spec_helper to avoid repeated code, and removes the spec.opts file which is
    ignored by rspec >= 2.
  5. @haus

    Merge pull request #84 from MosesMendoza/fix_release_rpm_var

    haus committed
    fix redhat spec release template variable
  6. @MosesMendoza

    fix redhat spec release template variable

    MosesMendoza committed
    fix redhat spec release template variable
    
    The rpm release variable changed in the packaging repo,
    this commit updates it
Commits on Aug 28, 2012
  1. @haus

    Merge pull request #83 from MosesMendoza/add_vars_to_preflight_erb_st…

    haus committed
    …op_sedding
    
    Replace sed with real vars in preflight.erb
Commits on Aug 27, 2012
  1. @MosesMendoza
Commits on Aug 24, 2012
  1. @haus

    Merge pull request #82 from MosesMendoza/use_read-only_git_repo

    haus committed
    Use read-only packaging repo for public access
  2. @MosesMendoza
  3. @haus

    Merge branch '1.x'

    haus committed
    Conflicts:
    	tasks/package.rake
  4. @haus

    Merge branch '1.0rc' into 1.x

    haus committed
  5. @mitchellh @haus
  6. @haus

    Merge branch '1.0rc' into 1.x

    haus committed
  7. @haus

    Merge pull request #81 from MosesMendoza/maint/1.0rc/shift_to_using_p…

    haus committed
    …ackaging_repo
    
    Maint/1.0rc/shift to using packaging repo
  8. @MosesMendoza
Commits on Aug 23, 2012
  1. @MosesMendoza
  2. @MosesMendoza
  3. @MosesMendoza

    Rework packaging to use packaging repo

    MosesMendoza committed
    This commit takes the hiera-specific data for
    packaging files and places it in ext, and removes
    much of the built-in packaging from hiera. A
    package:bootstrap task is added which pulls in
    the packaging repo, which contains packaging
    tasks that are in the load path of the
    top-level Rakefile. A package:teardown task
    removes the packaging repo. yaml files are
    added specifying packaging details for use
    with the packaging repo.
    
    Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Commits on Aug 21, 2012
  1. @haus

    Merge pull request #80 from MosesMendoza/update_build_depends_on_debh…

    haus committed
    …elper
    
    Change debhelper depends to 7
  2. @MosesMendoza

    Change debhelper depends to 7

    MosesMendoza committed
    Currently hiera build-depends on debhelper 8, but
    lucid ships with 7.x. This commit makes the dep
    7 for compatibility.
    
    Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Commits on Aug 17, 2012
  1. @ahpook

    Merge pull request #79 from mitchellh/ticket-15962

    ahpook committed
    Additional logging when finding keys in the YAML backend
Commits on Aug 14, 2012
  1. @mitchellh
Commits on Aug 13, 2012
  1. @MosesMendoza

    Merge pull request #78 from haus/ticket/1.0rc/15291_add_vendor_tag_to…

    MosesMendoza committed
    …_spec
    
    (#15291) Add Vendor tag to Hiera spec file
  2. @haus

    (#15291) Add Vendor tag to Hiera spec file

    haus committed
    Previously the spec file had no Vendor tag, which left it undefined. This
    commit adds a Vendor tag that references the _host_vendor macro, so that it can
    be easily set to 'Puppet Labs' internally and customized by users easily. The
    Vendor tag makes it easier for users to tell where the package came from.
Commits on Aug 2, 2012
  1. @haus

    Merge branch '1.0rc' into 1.x

    haus committed
  2. @whopper @haus
  3. @haus

    Merge pull request #77 from Whopper92/hiera_package_rake

    haus committed
    Update Debian packaging rake task to correctly create the orig.tar.gz
Commits on Jul 23, 2012
  1. @whopper
Commits on Jul 20, 2012
  1. @haus

    Merge branch '1.x'

    haus committed
  2. @haus

    Merge branch '1.0rc' into 1.x

    haus committed
  3. @haus

    Fix debian package task to create correct orig.tar.gz and use debvers…

    haus committed
    …ion in directory creation.
    
    Reviewed by: Moses Mendoza <moses@puppetlabs.com>
  4. @haus

    Update CHANGELOG for 1.0.0rc4

    haus committed
Commits on Jun 29, 2012
  1. Merge branch '1.x'

    Kelsey Hightower committed
  2. Merge branch '1.0rc' into 1.x

    Kelsey Hightower committed
Something went wrong with that request. Please try again.