diff options
author | Max Martin <max@puppetlabs.com> | 2011-06-02 15:46:17 -0700 |
---|---|---|
committer | Max Martin <max@puppetlabs.com> | 2011-06-02 15:46:17 -0700 |
commit | 4ad88017d3b8b8000325f5165520a6c21b48c469 (patch) | |
tree | cd126ce5723d8f2b390fda275f2e82e1dd8620d6 /lib/puppet/rails/rails_resource.rb | |
parent | 284113707fa07c6abcbb765dcd6d8c24e1b6b5fa (diff) | |
parent | c295ae699ff78f3d7e4922d00dcf5d9e92c790b8 (diff) | |
download | puppet-4ad88017d3b8b8000325f5165520a6c21b48c469.tar.gz puppet-4ad88017d3b8b8000325f5165520a6c21b48c469.tar.xz puppet-4ad88017d3b8b8000325f5165520a6c21b48c469.zip |
Merge branch '2.7rc' into 2.7.x
* 2.7rc: (24 commits)
(#7746) Fix bootstrap issues from #7717 fix.
(#7683) Use ronn, when available, to render the output.
(#7683) Add a 'man' face and subcommand to Puppet.
maint: remove obsolete work-around code from help face.
(#7699) Don't duplicate inherited action names on faces.
(#7177) Deprecate implicit 'puppet apply' for 2.7.0
(#7717) Layout cleanup for subcommand extraction.
#7211: Test unknown options don't shadow unknown actions.
#7211: nasty logic error with global Face options taking arguments.
#7211: more helpful error messages in various cases.
(#7708) Delete extended documentation from configuration reference
(#7707) Document signals in puppet agent and puppet master help
add puppet master polling step for ticket 7117
(#5318) Always notice changes to manifests when compiling.
(#7557) Remove Faces Application
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
Maint: Fix ellipses for short descriptions
(#7563) DRY: Remove indirector boilerplate from individual faces
...
Conflicts (resolved manually):
acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb
lib/puppet/application/faces.rb
lib/puppet/face/help/man.erb
lib/puppet/indirector/face.rb
spec/shared_behaviours/documentation_on_faces.rb
Diffstat (limited to 'lib/puppet/rails/rails_resource.rb')
0 files changed, 0 insertions, 0 deletions