Ubuntu
puppet package

Merge lp:~lynxman/ubuntu/oneiric/puppet/lp_854899 into lp:ubuntu/oneiric/puppet

  1. Oneiric (11.10)
  2. lp_854899
  3. Merge into oneiric
Proposed by Marc Cluet
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~lynxman/ubuntu/oneiric/puppet/lp_854899
Merge into: lp:ubuntu/oneiric/puppet
Diff against target: 108 lines (+37/-18)
4 files modified
debian/changelog (+18/-0)
debian/patches/debian-changes (+8/-18)
debian/patches/fix_logcheck (+10/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~lynxman/ubuntu/oneiric/puppet/lp_854899
Reviewer Review Type Date Requested Status
Marc Deslauriers Disapprove
Ubuntu branches Pending
Review via email: mp+76267@code.launchpad.net

Description of the change

* Merge with upstream debian

To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Whilst the FFe hasn't been accepted.. a quick look suggests the debian/changelog could use more detail, such as what Ubuntu changes remain - and if some were dropped, why?

Also the bug number in the format of LP: #854899

Do all the current ubuntu patches cleanly apply and unapply?

Revision history for this message
Marc Cluet (lynxman) wrote :

1. Nothing was dropped from the Ubuntu changes, just the part maintaned by debian was upgraded verbatim

2. All Ubuntu patches do cleanly apply and unapply, no issues

lp:~lynxman/ubuntu/oneiric/puppet/lp_854899 updated
53. By Marc Cluet

* Modified changelog to reflect LP bug number (LP: #854899)

Revision history for this message
Colin Watson (cjwatson) wrote :

On Tue, Sep 20, 2011 at 07:16:23PM -0000, Marc Cluet wrote:
> 1. Nothing was dropped from the Ubuntu changes, just the part maintaned by debian was upgraded verbatim

It's Ubuntu policy (https://wiki.ubuntu.com/UbuntuDevelopment/Merging)
to list the changes that are still outstanding every time we merge from
Debian. This makes sure we always have a current summary, and reminds
us to try to keep our unmerged delta as small as possible.

lp:~lynxman/ubuntu/oneiric/puppet/lp_854899 updated
54. By Marc Cluet

* Modified changelog to reflect Ubuntu diffs from debian upstream release

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

This was too late for Oneiric. Could you please change the merge request status? Thanks.

review: Disapprove

Unmerged revisions

54. By Marc Cluet

* Modified changelog to reflect Ubuntu diffs from debian upstream release

53. By Marc Cluet

* Modified changelog to reflect LP bug number (LP: #854899)

52. By Marc Cluet

* Merge with debian upstream (LP:#854899)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-07-25 01:00:37 +0000
+++ debian/changelog 2011-09-20 20:52:23 +0000
@@ -1,3 +1,21 @@
1puppet (2.7.3-1ubuntu1) oneiric; urgency=low
2
3 * Merge from debian unstable (LP: #854899). Remaining changes:
4 - debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
5 set the location of the CRL in apache2 configuration. Fix apache2
6 configuration on upgrade as well (LP: #641001)
7 - move all puppet dependencies to puppet-common since all the code
8 actually located in puppet-common.
9 - move libagueas from a recommend to a dependency.
10
11 -- Marc Cluet <marc.cluet@ubuntu.com> Tue, 20 Nov 2011 09:50:24 -0700
12
13puppet (2.7.3-1) unstable; urgency=low
14
15 * New upstream version
16
17 -- Stig Sandbeck Mathisen <ssm@debian.org> Tue, 16 Aug 2011 08:38:28 +0200
18
1puppet (2.7.1-1ubuntu1) oneiric; urgency=low19puppet (2.7.1-1ubuntu1) oneiric; urgency=low
220
3 * Merge from debian unstable. Remaining changes:21 * Merge from debian unstable. Remaining changes:
422
=== modified file 'debian/patches/debian-changes'
--- debian/patches/debian-changes 2011-07-25 01:00:37 +0000
+++ debian/patches/debian-changes 2011-09-20 20:52:23 +0000
@@ -3,8 +3,8 @@
3 but it might have accumulated changes from several uploads. Please3 but it might have accumulated changes from several uploads. Please
4 check the changelog to (hopefully) learn more on those changes.4 check the changelog to (hopefully) learn more on those changes.
55
6--- puppet-2.7.1.orig/Rakefile6--- puppet-2.7.3.orig/Rakefile
7+++ puppet-2.7.1/Rakefile7+++ puppet-2.7.3/Rakefile
8@@ -9,7 +9,7 @@ require 'rspec'8@@ -9,7 +9,7 @@ require 'rspec'
9 require "rspec/core/rake_task"9 require "rspec/core/rake_task"
10 10
@@ -14,16 +14,16 @@
14 end14 end
15 15
16 Dir['tasks/**/*.rake'].each { |t| load t }16 Dir['tasks/**/*.rake'].each { |t| load t }
17--- puppet-2.7.1.orig/test/lib/puppettest/fakes.rb17--- puppet-2.7.3.orig/test/lib/puppettest/fakes.rb
18+++ puppet-2.7.1/test/lib/puppettest/fakes.rb18+++ puppet-2.7.3/test/lib/puppettest/fakes.rb
19@@ -1,4 +1,4 @@19@@ -1,4 +1,4 @@
20-require File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/puppet/util'))20-require File.expand_path(File.join(File.dirname(__FILE__), '../../../lib/puppet/util'))
21+require '/usr/lib/ruby/1.8/puppet/util'21+require '/usr/lib/ruby/1.8/puppet/util'
22 22
23 module PuppetTest23 module PuppetTest
24 # A baseclass for the faketypes.24 # A baseclass for the faketypes.
25--- puppet-2.7.1.orig/lib/puppet/provider/service/init.rb25--- puppet-2.7.3.orig/lib/puppet/provider/service/init.rb
26+++ puppet-2.7.1/lib/puppet/provider/service/init.rb26+++ puppet-2.7.3/lib/puppet/provider/service/init.rb
27@@ -134,7 +134,15 @@ Puppet::Type.type(:service).provide :ini27@@ -134,7 +134,15 @@ Puppet::Type.type(:service).provide :ini
28 # we just return that; otherwise, we return false, which causes it to28 # we just return that; otherwise, we return false, which causes it to
29 # fallback to other mechanisms.29 # fallback to other mechanisms.
@@ -41,8 +41,8 @@
41 end41 end
42 42
43 end43 end
44--- puppet-2.7.1.orig/ext/rack/files/apache2.conf44--- puppet-2.7.3.orig/ext/rack/files/apache2.conf
45+++ puppet-2.7.1/ext/rack/files/apache2.conf45+++ puppet-2.7.3/ext/rack/files/apache2.conf
46@@ -1,12 +1,4 @@46@@ -1,12 +1,4 @@
47-47-
48-# you probably want to tune these settings48-# you probably want to tune these settings
@@ -97,13 +97,3 @@
97 Options None97 Options None
98 AllowOverride None98 AllowOverride None
99 Order allow,deny99 Order allow,deny
100--- puppet-2.7.1.orig/lib/puppet/network/rest_authconfig.rb
101+++ puppet-2.7.1/lib/puppet/network/rest_authconfig.rb
102@@ -18,6 +18,7 @@ module Puppet
103 { :acl => "/certificate/", :method => :find, :authenticated => false },
104 { :acl => "/certificate_request", :method => [:find, :save], :authenticated => false },
105 { :acl => "/status", :method => [:find], :authenticated => true },
106+ { :acl => "/resource", :method => [:find, :save, :search], :authenticated => true },
107 ]
108
109 def self.main
110100
=== added file 'debian/patches/fix_logcheck'
--- debian/patches/fix_logcheck 1970-01-01 00:00:00 +0000
+++ debian/patches/fix_logcheck 2011-09-20 20:52:23 +0000
@@ -0,0 +1,10 @@
1--- a/ext/logcheck/puppet
2+++ b/ext/logcheck/puppet
3@@ -1,6 +1,6 @@
4 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: (Handled resources in|Resource comparison took|Searched for (host|resources|resource params and tags) in) [0-9.]+ seconds
5 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Starting Puppet server version [.0-9]+$
6-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in [.0-9]+ seconds$
7+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in environment [._[:alnum:]-]+ in [.[:digit:]]+ seconds$
8 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Caught TERM; shutting down$
9 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-master\[[0-9]+\]: Shutting down$
10 ^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppet-agent\[[0-9]+\]: Starting Puppet client version [.0-9]+$
011
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-07-25 01:00:37 +0000
+++ debian/patches/series 2011-09-20 20:52:23 +0000
@@ -1,1 +1,2 @@
1fix_logcheck
1debian-changes2debian-changes

Subscribers

People subscribed via source and target branches

to all changes: