diff options
| author | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-03-25 18:18:34 -0500 |
| commit | a8592f1009040ebf30a98268610915cc33bb3f63 (patch) | |
| tree | 49f61323a8536d58ce332e97b882677f55727df7 /test/ral/providers/mailalias | |
| parent | e1907798425a7b163ac1b831b0cf11e88985815e (diff) | |
| parent | 491a69682728818e04b8a20a5d8f4f783ad6ddaf (diff) | |
| download | puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.gz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.tar.xz puppet-a8592f1009040ebf30a98268610915cc33bb3f63.zip | |
Merge branch '0.24.x'
Conflicts:
install.rb
lib/puppet/defaults.rb
man/man8/puppet.8
Diffstat (limited to 'test/ral/providers/mailalias')
| -rwxr-xr-x | test/ral/providers/mailalias/aliases.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb index 663d4359c..ec8b84684 100755 --- a/test/ral/providers/mailalias/aliases.rb +++ b/test/ral/providers/mailalias/aliases.rb @@ -4,7 +4,6 @@ require File.dirname(__FILE__) + '/../../../lib/puppettest' require 'puppettest' require 'puppettest/fileparsing' -require 'puppet/type/mailalias' class TestMailaliasAliasesProvider < Test::Unit::TestCase include PuppetTest |