Merge lp:~clint-fewbar/ubuntu-seeds/add-memcached-and-libmemcached into lp:~ubuntu-core-dev/ubuntu-seeds/platform.maverick
Proposed by
Clint Byrum
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merge reported by: | Mathias Gug | ||||||||
| Merged at revision: | not available | ||||||||
| Proposed branch: | lp:~clint-fewbar/ubuntu-seeds/add-memcached-and-libmemcached | ||||||||
| Merge into: | lp:~ubuntu-core-dev/ubuntu-seeds/platform.maverick | ||||||||
| Diff against target: |
22 lines (+5/-0) 1 file modified
supported-misc-servers (+5/-0) |
||||||||
| To merge this branch: | bzr merge lp:~clint-fewbar/ubuntu-seeds/add-memcached-and-libmemcached | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mathias Gug | Approve | ||
| Ubuntu Server | Pending | ||
|
Review via email:
|
|||
Description of the change
Adding libmemcached and memcached to main.
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
The proposed branch is using a different repository format and thus is unmergeable. I've directly applied the diff to the master ubuntu-seed branch (thus loosing history). If a local bzr repository is used (ie bzr init-repo) it should be created with the correct format (ie the same as the one from the master ubuntu-seeds branch).
Adding a comment to the end of each line (ie #Clint.... name-of-spec) is not necessary as long as the bzr commit message includes the relevant information. bzr blame can then be used to figure out who/why/when the line was added to the seed file.