Merge lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 into lp:ubuntu/lucid-updates/facter
Status: | Needs review | ||||||||
---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 | ||||||||
Merge into: | lp:ubuntu/lucid-updates/facter | ||||||||
Diff against target: |
51 lines (+18/-2) 3 files modified
debian/changelog (+11/-0) lib/facter/ec2.rb (+2/-1) lib/facter/util/collection.rb (+5/-1) |
||||||||
To merge this branch: | bzr merge lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Luke Yelavich (community) | Approve | ||
Review via email: mp+80366@code.launchpad.net |
Description of the change
Rebased a previous MP on lucid-updates. Properly versioned and applied patches as per feedback from James Page on original MP:
A few comments that need resolution before we can upload:
1) The branch is currently based on 1.5.6-2ubuntu2 from the lucid release pocket; it needs to be based on 1.5.6-2ubuntu2.1 from lucid-updates - this is why the merge shows a conflict in debian/changelog
2) This package in Lucid uses an earlier version of debhelper and is source format 1.0; so patches don't get automatically applied. The correct course of action (as one patch has already be directly applied in 1.5.6-2ubuntu2.1) is to directly apply the patches to the upstream source tree. Ugly but its the most minimal change for the SRU and does not impact the update that has already been made
Unmerged revisions
- 14. By Adam Gandelman
-
Fix series
- 13. By Adam Gandelman
-
lib/facter/
util/collection .rb: Backported fix from upstream commit
2255abee7bdb9b6478ca228546e3d2 75dbac0ec3. Reload all facts if the
requested fact is not found. Ensures consistency after facts
have been cleared. (LP: #876130) - 12. By Adam Gandelman
-
lib/facter/ec2.rb: Properly handle ip+port when testing connectivity
of ec2 metadata service.(LP: #732953)
Uploaded, thanks for your work.