diff options
author | Matt Robinson <matt@puppetlabs.com> | 2011-05-26 15:49:06 -0700 |
---|---|---|
committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-26 15:49:06 -0700 |
commit | d0592fabd27472ba0f5586393eff20e536f8766a (patch) | |
tree | 1ee331fa0f325d8a545e01d06ed068287d1a9eb1 /lib/puppet/rails/rails_resource.rb | |
parent | 59e6be30f24dfb1011fbb242029b5ff61e19514c (diff) | |
parent | bc71266f4f76439bc7fc5ba5b78895e801cf8736 (diff) | |
download | puppet-d0592fabd27472ba0f5586393eff20e536f8766a.tar.gz puppet-d0592fabd27472ba0f5586393eff20e536f8766a.tar.xz puppet-d0592fabd27472ba0f5586393eff20e536f8766a.zip |
Merge branch 'ticket/2.7.x/maint-faces_docs_spec_fixes' into 2.7.x
* ticket/2.7.x/maint-faces_docs_spec_fixes:
maint: Fix order dependent spec failure for face indirection
(#7690) Don't blow up when listing terminuses available for faces
maint: Dedup the loadpath so we don't have to walk it multiple times
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions