diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-23 23:16:51 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-23 23:16:51 -0700 |
| commit | 7f826bfc1352ef84b2e990874c6285c5aca66bac (patch) | |
| tree | bf2d11a0bf96d4372ecb1daaa51f6f7a354800c0 /lib/puppet/rails/rails_resource.rb | |
| parent | 25b967559dfa39eb094008c7a3952c4ee885530b (diff) | |
| parent | e0b63a27382b577ce8af497238f702193ad15795 (diff) | |
| download | puppet-7f826bfc1352ef84b2e990874c6285c5aca66bac.tar.gz puppet-7f826bfc1352ef84b2e990874c6285c5aca66bac.tar.xz puppet-7f826bfc1352ef84b2e990874c6285c5aca66bac.zip | |
Merge branch '2.7.x'
* 2.7.x:
(#7502) Fixed parser spec for ruby 1.8.5
(#7507) Add more 1.9 filters
(#6395) Add extpuppet help, eval, and interfaces
maint: move trap call to Signal so we can stub it for specs
Updated CHANGELOG for 2.7.0rc3
(#7259) Remove ActiveRecord requirement from indirector face spec
(#7259) Do not try to load all Terminus classes when configuring the Indirector
Adding a sleep state post starting master
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions