[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, experimental, updated. debian/2.1.1-1_experimental1-51-g95835b7

[Garrett Holmstrom]

The following commit has been merged in the experimental branch:
commit b4e816710b029e12d625b46e257b8aaa3e5783e3
Merge: dabf24057e6b8f9c1606d8e1c4ee290c0f8fe2d4 f60d54fd4a9054bd5a74c9e97e56e4db85514e02
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Aug 22 17:01:58 2012 -0700

    Merge branch '2.1-maint'
    
    Conflicts:
    	euca2ools/__init__.py
    	euca2ools/bundler.py
    	euca2ools/commands/euca/bundlevol.py
    	man/euare-accountaliascreate.1
    	man/euare-accountaliasdelete.1
    	man/euare-accountaliaslist.1
    	man/euare-accountcreate.1
    	man/euare-accountdel.1
    	man/euare-accountdelpolicy.1
    	man/euare-accountgetpolicy.1
    	man/euare-accountgetsummary.1
    	man/euare-accountlist.1
    	man/euare-accountlistpolicies.1
    	man/euare-accountuploadpolicy.1
    	man/euare-getldapsyncstatus.1
    	man/euare-groupaddpolicy.1
    	man/euare-groupadduser.1
    	man/euare-groupcreate.1
    	man/euare-groupdel.1
    	man/euare-groupdelpolicy.1
    	man/euare-groupgetpolicy.1
    	man/euare-grouplistbypath.1
    	man/euare-grouplistpolicies.1
    	man/euare-grouplistusers.1
    	man/euare-groupmod.1
    	man/euare-groupremoveuser.1
    	man/euare-groupuploadpolicy.1
    	man/euare-servercertdel.1
    	man/euare-servercertgetattributes.1
    	man/euare-servercertlistbypath.1
    	man/euare-servercertmod.1
    	man/euare-servercertupload.1
    	man/euare-useraddcert.1
    	man/euare-useraddkey.1
    	man/euare-useraddloginprofile.1
    	man/euare-useraddpolicy.1
    	man/euare-usercreate.1
    	man/euare-usercreatecert.1
    	man/euare-userdeactivatemfadevice.1
    	man/euare-userdel.1
    	man/euare-userdelcert.1
    	man/euare-userdelkey.1
    	man/euare-userdelloginprofile.1
    	man/euare-userdelpolicy.1
    	man/euare-userenablemfadevice.1
    	man/euare-usergetattributes.1
    	man/euare-usergetinfo.1
    	man/euare-usergetloginprofile.1
    	man/euare-usergetpolicy.1
    	man/euare-userlistbypath.1
    	man/euare-userlistcerts.1
    	man/euare-userlistgroups.1
    	man/euare-userlistkeys.1
    	man/euare-userlistmfadevices.1
    	man/euare-userlistpolicies.1
    	man/euare-usermod.1
    	man/euare-usermodcert.1
    	man/euare-usermodkey.1
    	man/euare-usermodloginprofile.1
    	man/euare-userresyncmfadevice.1
    	man/euare-userupdateinfo.1
    	man/euare-useruploadpolicy.1
    	man/euca-allocate-address.1
    	man/euca-associate-address.1
    	man/euca-attach-volume.1
    	man/euca-authorize.1
    	man/euca-bundle-image.1
    	man/euca-bundle-instance.1
    	man/euca-bundle-upload.1
    	man/euca-bundle-vol.1
    	man/euca-cancel-bundle-task.1
    	man/euca-check-bucket.1
    	man/euca-confirm-product-instance.1
    	man/euca-create-group.1
    	man/euca-create-image.1
    	man/euca-create-keypair.1
    	man/euca-create-snapshot.1
    	man/euca-create-tags.1
    	man/euca-create-volume.1
    	man/euca-delete-bundle.1
    	man/euca-delete-group.1
    	man/euca-delete-keypair.1
    	man/euca-delete-snapshot.1
    	man/euca-delete-tags.1
    	man/euca-delete-volume.1
    	man/euca-deregister.1
    	man/euca-describe-addresses.1
    	man/euca-describe-availability-zones.1
    	man/euca-describe-bundle-tasks.1
    	man/euca-describe-group.1
    	man/euca-describe-image-attribute.1
    	man/euca-describe-images.1
    	man/euca-describe-instances.1
    	man/euca-describe-keypairs.1
    	man/euca-describe-regions.1
    	man/euca-describe-snapshots.1
    	man/euca-describe-tags.1
    	man/euca-describe-volumes.1
    	man/euca-detach-volume.1
    	man/euca-disassociate-address.1
    	man/euca-download-bundle.1
    	man/euca-get-console-output.1
    	man/euca-get-password-data.1
    	man/euca-get-password.1
    	man/euca-import-keypair.1
    	man/euca-modify-image-attribute.1
    	man/euca-monitor-instances.1
    	man/euca-reboot-instances.1
    	man/euca-register.1
    	man/euca-release-address.1
    	man/euca-reset-image-attribute.1
    	man/euca-revoke.1
    	man/euca-run-instances.1
    	man/euca-start-instances.1
    	man/euca-stop-instances.1
    	man/euca-terminate-instances.1
    	man/euca-unbundle.1
    	man/euca-unmonitor-instances.1
    	man/euca-upload-bundle.1
    	man/euca-version.1
    	man/eustore-describe-images.1
    	man/eustore-install-image.1

diff --combined euca2ools/bundler.py
index 7162961,ceefa3c..722dcda
--- a/euca2ools/bundler.py
+++ b/euca2ools/bundler.py
@@@ -225,8 -225,8 +225,8 @@@ class Bundler(object)
              print
              print 'WARNING: retrying encryption to work around a rare RNG bug'
              print 'Please report the following values to Eucalyptus Systems at'
-             print 'https://bugs.launchpad.net/bugs/904062 to help diagnose'
-             print 'this issue.'
+             print 'https://eucalyptus.atlassian.net/browse/TOOLS-103 to help'
+             print 'diagnose this issue.'
              print 'k: ', key
              print 'iv:', iv
              print
@@@ -417,7 -417,7 +417,7 @@@
          if mapping:
              block_dev_mapping_elem = \
                  doc.createElement('block_device_mapping')
 -            for vname,dname in mapping.items():
 +            for vname, dname in mapping.items():
                  mapping_elem = doc.createElement('mapping')
                  virtual_elem = doc.createElement('virtual')
                  virtual_value = doc.createTextNode(vname)

-- 
managing cloud instances for Eucalyptus