← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/cmd/storage.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/cmd/storage.py
16
16
 
17
17
import logging
18
18
 
19
 
from oslo.config import cfg
 
19
from oslo_config import cfg
20
20
 
21
21
from ceilometer.i18n import _
22
22
from ceilometer import service
23
23
from ceilometer import storage
24
24
 
25
 
cfg.CONF.import_opt('time_to_live', 'ceilometer.storage',
26
 
                    group='database')
27
 
 
28
25
LOG = logging.getLogger(__name__)
29
26
 
30
27