diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-17 11:41:26 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-17 11:41:26 -0700 |
| commit | 3a3a5100305a5334397c350f4e8e42a7f9b7e3f6 (patch) | |
| tree | 8099f52b80cb371b5dd01840345b1bd3d3ac264a /lib/puppet/rails/rails_resource.rb | |
| parent | 020c47645c7d882b1eac5150fd47227806af8aed (diff) | |
| parent | e4bb85af3216473e82a263f41c39c34489940276 (diff) | |
| download | puppet-3a3a5100305a5334397c350f4e8e42a7f9b7e3f6.tar.gz puppet-3a3a5100305a5334397c350f4e8e42a7f9b7e3f6.tar.xz puppet-3a3a5100305a5334397c350f4e8e42a7f9b7e3f6.zip | |
Merge branch '2.6.x' into 2.7.x
* 2.6.x:
Reset indirector state after configurer tests.
(#8770) Don't fail to set supplementary groups when changing user to root
(#8770) Always fully drop privileges when changing user
(#8662) Migrate suidmanager test case to rspec
(#8740) Do not enumerate files in the root directory.
(#3553) Explain that cron resources require time attributes
Conflicts:
lib/puppet/application/resource.rb
test/puppet/tc_suidmanager.rb
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions