← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/openstack/common/rpc/impl_qpid.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2013-03-20 12:59:22 UTC
  • mfrom: (1.1.69)
  • Revision ID: package-import@ubuntu.com-20130320125922-ohvfav96lemn9wlz
Tags: 1:2013.1~rc1-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.
  - Add sqlite3 required for the testsuite.

[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/openstack/common/rpc/impl_qpid.py
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
2
 
3
 
#    Copyright 2011 OpenStack LLC
 
3
#    Copyright 2011 OpenStack Foundation
4
4
#    Copyright 2011 - 2012, Red Hat, Inc.
5
5
#
6
6
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
415
415
 
416
416
        def _error_callback(exc):
417
417
            if isinstance(exc, qpid_exceptions.Empty):
418
 
                LOG.exception(_('Timed out waiting for RPC response: %s') %
419
 
                              str(exc))
 
418
                LOG.debug(_('Timed out waiting for RPC response: %s') %
 
419
                          str(exc))
420
420
                raise rpc_common.Timeout()
421
421
            else:
422
422
                LOG.exception(_('Failed to consume message from queue: %s') %