[Merge] lp:~smoser/ubuntu/precise/apport/ec2-metadata-timeout into lp:~ubuntu-core-dev/ubuntu/precise/apport/ubuntu

[Scott Moser]

Scott Moser has proposed merging lp:~smoser/ubuntu/precise/apport/ec2-metadata-timeout into lp:~ubuntu-core-dev/ubuntu/precise/apport/ubuntu.

Requested reviews:
  Ubuntu Core Development Team (ubuntu-core-dev)
Related bugs:
  Bug #855651 in apport (Ubuntu): "apport can hang when checking for ec2 metadata"
  https://bugs.launchpad.net/ubuntu/+source/apport/+bug/855651

For more details, see:
https://code.launchpad.net/~smoser/ubuntu/precise/apport/ec2-metadata-timeout/+merge/100552

timeout on attempts to contact ec2 metadata service

Instead of hanging forever, timeout after 5 seconds.  Any reasonable metadata service would come back in that amount of time.
-- 
https://code.launchpad.net/~smoser/ubuntu/precise/apport/ec2-metadata-timeout/+merge/100552
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~smoser/ubuntu/precise/apport/ec2-metadata-timeout into lp:~ubuntu-core-dev/ubuntu/precise/apport/ubuntu.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1450 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20120403/8160a611/attachment.diff>