Project

General

Profile

« Previous | Next » 

Revision 07e103a3

Added by Sam Kottler over 11 years ago

  • ID 07e103a31e5180146721003f2c219b45a2461923

Merge remote-tracking branch 'origin/develop'

  • origin/develop:
    Updated submodules to latest and added option to run puppet to the generator
    Use Puppet's own create_resources function if available
    Add create_resources from puppetlabs to make this work on 2.6
    Ensure the terminal global is always set
    Fix Puppet 2.6 compatibility, parse error with hash in function call
    Use git submodule foreach
    Add answers generator v0.1
    Version bump
    Bump foreman/foreman_proxy/puppet for 1.1RC repo support
    Update README.md
    Bump dhcp/dns/foreman/foreman_proxy/passenger/puppet
    Rename loadyaml to loadanyyaml to prevent stdlib conflict
    bump concat/dhcp/puppet/foreman/tftp
    Throw error when YAML type is unknown
    Change YAML path to /etc/foreman-proxy/answers.yaml for consistency Parameterise foreman_installer class for answers.yaml location
    Update foreman, foreman_proxy, and puppet module commits
    Reapply YAML in develop branch
  • added
  • modified
  • copied
  • renamed
  • deleted