Merge lp:~ubuntu-branches/ubuntu/precise/euca2ools/precise-201207041152 into lp:ubuntu/precise/euca2ools

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/euca2ools reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/euca2ools/precise-201207041152. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

61. By Scott Moser on 2012-03-22

releasing version 2.0.0~bzr516-0ubuntu3

60. By Scott Moser on 2012-03-22

debian/patches/import-keypair-fix-import.patch: fix
import-keypair to use content of filename, not filename (LP: #904739)

59. By Scott Moser on 2012-03-15

releasing version 2.0.0~bzr516-0ubuntu2

58. By Scott Moser on 2012-03-15

debian/patches/describe-images-empty-fields.patch: output of
euca-describe-images is now more consistent with ec2-describe-instances
(LP: #954068)

57. By Scott Moser on 2012-03-05

releasing version 2.0.0~bzr516-0ubuntu1

56. By Scott Moser on 2012-03-05

--config now works (LP: #891252)

55. By Scott Moser on 2012-03-05

debian/control: update standards version to 3.9.3

54. By Scott Moser on 2012-03-05

* debian/patches/describe-instances-add-additional-fields.patch
  add additional output fields including ipaddress and private_ipaddress
  to euca-describe-instances (LP: #947342).
* debian/patches/describe-instances-ipv4-flag.patch: dropped
  --ipv4 flag was deleted. Instead, field 16 and 17 should be used
  for reading ip addresses.

53. By Scott Moser on 2012-03-05

sync euca2ools.spec and setup.py to versions from trunk revision 516

These files got missed in the merge.

52. By Scott Moser on 2012-03-05

* New upstream snapshot.
  * merged upstream:
    * debian/patches/remove-hardcoded-region-list.patch
    * debian/patches/fix-bin-programs-usr-local.patch
    * debian/patches/eustore-install-image-help.patch