Merge lp://staging/~gandelman-a/ubuntu/natty/facter/lp876130_lp732953 into lp://staging/ubuntu/natty/facter
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merge reported by: | Martin Pitt |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~gandelman-a/ubuntu/natty/facter/lp876130_lp732953 |
| Merge into: | lp://staging/ubuntu/natty/facter |
| Diff against target: |
152 lines (+64/-38) 7 files modified
.pc/applied-patches (+0/-1) .pc/debian-changes-1.5.8-2ubuntu2/lib/facter/ec2.rb (+0/-35) debian/changelog (+10/-0) debian/patches/fix_ec2_metadata_facts.patch (+22/-0) debian/patches/reload_all_facts.patch (+28/-0) debian/patches/series (+2/-0) lib/facter/ec2.rb (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/ubuntu/natty/facter/lp876130_lp732953 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Luke Yelavich (community) | Approve | ||
| James Page | Needs Fixing | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
facter (1.5.8-2ubuntu3) natty-proposed; urgency=low
* debian/
requested fact is not found. Ensures consistency after facts
have been cleared. (LP: #876130)
* debian/
when testing connectivity of ec2 metadata service.(LP: #732953)
-- Adam Gandelman <email address hidden> Thu, 20 Oct 2011 10:40:35 -0700
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Hi Adam
Thanks for the merge proposal; comments that need resolution prior to upload
- You have correctly targeted proposed but the version is not correctly numbered: 1.5.8-2ubuntu3 -> 1.5.8-2ubuntu2.1
And something that always annoys me but does not need fixing (and and explanation of why)
When the package importer imports uploaded/synced packages which are source format 3.0 it imports then 'patches applied' - hence why there is a .pc folder in the branch.
I generally do the same - i.e. I apply all patches and add the .pc folder contents to the branch - as it makes it a little easier to read when the package already has patches (as in this case - at first look it looks like you have removed a patch) - it also shows that the patches apply OK and the changes in context as well.
Cheers
James