← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ceilometer/vivid

« back to all changes in this revision

Viewing changes to ceilometer/objectstore/swift_middleware.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-02-19 14:59:07 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20150219145907-9jojybdsl64zcn14
Tags: 2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/p/skip-test.patch: Rebased.

[ James Page ]
* d/rules,d/p/skip-gabbi.patch: Skip tests that rely on python-gabbi until
  packaging and MIR is complete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/objectstore/swift_middleware.py
2
2
#
3
3
# Copyright 2012 eNovance <licensing@enovance.com>
4
4
#
5
 
# Author: Julien Danjou <julien@danjou.info>
6
 
#
7
5
# Licensed under the Apache License, Version 2.0 (the "License");
8
6
# you may not use this file except in compliance with the License.
9
7
# You may obtain a copy of the License at
42
40
from __future__ import absolute_import
43
41
import logging
44
42
 
45
 
from oslo.utils import timeutils
 
43
from oslo_context import context
 
44
from oslo_utils import timeutils
46
45
import six
47
46
import six.moves.urllib.parse as urlparse
48
47
 
49
 
from ceilometer.openstack.common import context
 
48
from ceilometer.openstack.common import versionutils
50
49
from ceilometer import pipeline
51
50
from ceilometer import sample
52
51
from ceilometer import service
82
81
        return line
83
82
 
84
83
 
 
84
@versionutils.deprecated(as_of=versionutils.deprecated.KILO,
 
85
                         in_favor_of='ceilometermiddleware.swift:Swift')
85
86
class CeilometerMiddleware(object):
86
87
    """Ceilometer middleware used for counting requests."""
87
88