← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/cli.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/cli.py
3
3
#
4
4
# Copyright 2012-2014 Julien Danjou
5
5
#
6
 
# Author: Julien Danjou <julien@danjou.info>
7
 
#
8
6
# Licensed under the Apache License, Version 2.0 (the "License"); you may
9
7
# not use this file except in compliance with the License. You may obtain
10
8
# a copy of the License at
28
26
# first read() or select(), thread need to be patched too, because
29
27
# oslo.messaging use threading.local
30
28
eventlet.monkey_patch(socket=True, select=True, thread=True)
31
 
from oslo.config import cfg
32
 
from oslo.utils import timeutils
 
29
from oslo_config import cfg
 
30
from oslo_context import context
 
31
from oslo_utils import timeutils
33
32
 
34
 
from ceilometer.openstack.common import context
35
33
from ceilometer import pipeline
36
34
from ceilometer import sample
37
35
from ceilometer import service