Merge lp:~ampelbein/puppet/lp-726856 into lp:ubuntu/natty/puppet

Proposed by Andreas Moog on 2011-03-01
Status: Merged
Merged at revision: 48
Proposed branch: lp:~ampelbein/puppet/lp-726856
Merge into: lp:ubuntu/natty/puppet
Diff against target: 26 lines (+7/-3)
2 files modified
debian/changelog (+7/-0)
debian/puppetmaster.default (+0/-3)
To merge this branch: bzr merge lp:~ampelbein/puppet/lp-726856
Reviewer Review Type Date Requested Status
Dave Walker 2011-03-01 Approve on 2011-03-01
Review via email: mp+51744@code.launchpad.net

Description of the change

puppet (2.6.4-2ubuntu2) UNRELEASED; urgency=low

  * debian/puppetmaster.default
    - fix remains of automated merge (LP: #726856)

 -- Andreas Moog <email address hidden> Tue, 01 Mar 2011 14:04:06 +0100

To post a comment you must log in.
Dave Walker (davewalker) wrote :

Well caught, i removed an extra white space line at EOF and uploaded!

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-08 00:28:43 +0000
3+++ debian/changelog 2011-03-01 13:16:14 +0000
4@@ -1,3 +1,10 @@
5+puppet (2.6.4-2ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/puppetmaster.default
8+ - fix remains of automated merge (LP: #726856)
9+
10+ -- Andreas Moog <amoog@ubuntu.com> Tue, 01 Mar 2011 14:04:06 +0100
11+
12 puppet (2.6.4-2ubuntu1) natty; urgency=low
13
14 * Merge from debian unstable. Remaining changes:
15
16=== modified file 'debian/puppetmaster.default'
17--- debian/puppetmaster.default 2011-02-08 00:28:43 +0000
18+++ debian/puppetmaster.default 2011-03-01 13:16:14 +0000
19@@ -36,7 +36,4 @@
20 # port 8140 and change the below number to something else, such as
21 # 18140.
22 PORT=8140
23-<<<<<<< puppet-2.6.3-0ubuntu1 (ubuntu)
24-=======
25
26->>>>>>> puppet-2.6.4-2 (debian)

Subscribers

People subscribed via source and target branches

to all changes: