Merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/cloud-utils/maverick-201009260914 into lp://qastaging/ubuntu/maverick/cloud-utils
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/maverick/cloud-utils/maverick-201009260914 |
Merge into: | lp://qastaging/ubuntu/maverick/cloud-utils |
Diff against target: | 0 lines |
To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/cloud-utils/maverick-201009260914 |
Related bugs: |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/cloud-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/cloud-utils/maverick-201009260914. A merge should be performed if necessary.
Unmerged revisions
- 58. By Scott Moser
-
release 0.15ubuntu1
- uec-publish-tarball: support --loader flag to use the loader
image rather than linux kernel in uec tarballs - 57. By Dustin Kirkland
-
debian/control, debian/
ssh-import. install, debian/ ssh-import. manpages,
ssh-import-lp-id, ssh-import-lp-id.1: purge ssh-importfrom this
source package, now pushed to openssh-server 1:5.5p1-4ubuntu3 - 56. By Scott Moser
-
[ Dustin Kirkland ]
* ssh-import-lp-id: handle multi-line ssh public keys in Launchpad,
LP: #596938; thanks to Jos Boumans for the elegant snippet of perl that
fixes this
[ Clint Byrum ]
* uec-run-instances: rewritten command with much larger scope