diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-30 13:01:46 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-30 13:01:46 -0700 |
| commit | 11309a214148abb2167c1bd0adba0e035b2d8384 (patch) | |
| tree | bfd37ac5887307857d0b0d79a1db034010eed424 /tasks/rake | |
| parent | 9290b2f990fd4b267b2eb0da719b8f320484c4d7 (diff) | |
| parent | 9d17809e5b240aa80d2c30f4d9625d4812802b8f (diff) | |
| download | puppet-11309a214148abb2167c1bd0adba0e035b2d8384.tar.gz puppet-11309a214148abb2167c1bd0adba0e035b2d8384.tar.xz puppet-11309a214148abb2167c1bd0adba0e035b2d8384.zip | |
Merge branch '2.6.x' into next
* 2.6.x:
(#5908) Add support for new update-rc.d disable API
(#6862) Add a default subject for the mail_patches rake task
Fixed #6256 - Creation of rrd directory.
Diffstat (limited to 'tasks/rake')
| -rw-r--r-- | tasks/rake/git_workflow.rake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake index 75dc8833a..56a414568 100644 --- a/tasks/rake/git_workflow.rake +++ b/tasks/rake/git_workflow.rake @@ -119,12 +119,14 @@ task :mail_patches do # If we've got more than one patch, add --compose if files.length > 1 compose = "--compose" + subject = "--subject \"#{type} #{name} against #{parent}\"" else compose = "" + subject = "" end # Now send the mail. - sh "git send-email #{compose} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch" + sh "git send-email #{compose} #{subject} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch" # Finally, clean up the patches sh "rm 00*.patch" |