← Back to branch summary

~bkerensa/ubuntu/raring/puppet/new-upstream-release

« back to all changes in this revision

Viewing changes to test/ral/manager/manager.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-07-25 01:00:37 UTC
  • mfrom: (1.1.24 upstream) (3.1.25 sid)
  • Revision ID: james.westby@ubuntu.com-20110725010037-875vuxs10eboqgw3
Tags: 2.7.1-1ubuntu1
https://launchpad.net/bugs/641001
* Merge from debian unstable.  Remaining changes:
  - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
    set the location of the CRL in apache2 configuration. Fix apache2
    configuration on upgrade as well (LP: #641001)
  - move all puppet dependencies to puppet-common since all the code
    actually located in puppet-common.
  - move libagueas from a recommend to a dependency.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/ral/manager/manager.rb
3
3
#  Created by Luke A. Kanies on 2006-11-29.
4
4
#  Copyright (c) 2006. All rights reserved.
5
5
 
6
 
require File.dirname(__FILE__) + '/../../lib/puppettest'
 
6
require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
7
7
 
8
8
require 'puppettest'
9
9