Project

General

Profile

« Previous | Next » 

Revision 29c5b19b

Added by Jonathan CLARKE over 12 years ago

Merge branch 'branches/rudder/2.3'

  • branches/rudder/2.3:
    Don't create deprecated /var/rudder/policy-templates directory. Fixes #2031
    Refs #1984: The git clones GitHub URLs are fixed
    Update packaging for change from /var/rudder/policy-templates to /var/rudder/configuration-repository/policy-templates: change config file paths. Really fixes #2013
    Update packaging for change from /var/rudder/policy-templates to /var/rudder/configuration-repository/policy-templates. Fixes #2013 (cherry picked from commit 39a961dc87a7ffb58cb3e995859c4096c114dba4)
    Add patch from CFEngine SVN. Fixes #1998 (cherry picked from commit 4e545796317da8c3977a251ec530d74e716b3fbb)
    Refs #1964 default branch value removed
    Fixes #1963 reportsBootstrap.sql occurrence deleted
    Refs #1962 permit override
    Refs #1962 Get Rudder 2.3 sources

Conflicts:
rudder-webapp/SPECS/rudder-webapp.spec
rudder-webapp/debian/postinst

  • added
  • modified
  • copied
  • renamed
  • deleted