diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:08:45 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-16 14:08:45 -0800 |
| commit | b4035315aaad37df97d4e620b4f972cad201d04f (patch) | |
| tree | 2be10cd07b1c8c45d63ec38adb7f35927841b864 /lib/puppet/util/rdoc/code_objects.rb | |
| parent | d211dc9b7b756634d8bb568454d06aa6b0f66b5b (diff) | |
| parent | d74e8e18047a4cbc2e77802324eb97a07a4ddb63 (diff) | |
| download | puppet-b4035315aaad37df97d4e620b4f972cad201d04f.tar.gz puppet-b4035315aaad37df97d4e620b4f972cad201d04f.tar.xz puppet-b4035315aaad37df97d4e620b4f972cad201d04f.zip | |
Merge branch 'ticket/2.6.next/maint-fix_active_record_confine' into 2.6.next
* ticket/2.6.next/maint-fix_active_record_confine:
maint: Fix ActiveRecord confine issue
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions