Merge "sql: fix 003 downgrade"
Imported Translations from Transifex

Change-Id: I8685c343fc60292dba41d0e92927a6d9d3e4b64e
Add support for limiting the number of samples returned

Blueprint: api-limit

Change-Id: Id053eb60674fea58b3d83b460fd0344dbc050cbf
Signed-off-by: Julien Danjou <julien@danjou.info>
Merge "Switch to sphinxcontrib-pecanwsme for API docs"
Session does not use ceilometer.conf's database_connection

use [database]connection setting from openstack.common sqlalchemy session

Change-Id: I582d4cb7d51d6ddecc27ae5fcdedcfd19dc898af
Fixes: bug #1183106
Start to use Hacking

Instead of ignoring all Hacking warnings, blacklist
those that need lots of changes and fix the easy one.

Change-Id: I0a31982b1ff17c54e1347bff5358bb9f8e637b6f
python3: Introduce py33 to tox.ini

Introduce py33 to tox.ini to make testing with
python3 easier.

Change-Id: I96d1ecd3f0069295e27127239c83afc32673ffec
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Merge "Start to use Hacking"
Merge "Add support for limiting the number of samples returned"
Merge "service: remove useless PeriodicService class"
api: add limit parameters to meters

Blueprint: api-limit

Change-Id: I4203973bbf5a5566a3442a467984aec59805f216
Signed-off-by: Julien Danjou <julien@danjou.info>
Merge "python3: Introduce py33 to tox.ini"
session flushing error

stop sharing a single session for everything. use common.db.sqlalchemy code
to handle session management

re-enable use of CEILOMETER_TEST_SQL_URL

Change-Id: I9df407704a8db9e37d05b2a80047e5539f2d15d8
Fixes: bug 1183996
sqlalchemy: migration error when running db-sync

migration incorrectly sorted order of tables for Events causing Event
and Trait tables to be generated before unique_name table which both tables
require

Change-Id: I6fe7ceb0905ace3993116c6a274b6c39e11554bf
Fixes:Bug #1186283
Merge "api: add limit parameters to meters"
Merge "sqlalchemy: migration error when running db-sync"
Merge "session flushing error"
Use console scripts for ceilometer-collector

Blueprint: setuptools-console-scripts

Change-Id: I7d600eae8b29b3135b026dfb3ad0a848541f872e
Signed-off-by: Julien Danjou <julien@danjou.info>
Move os_* options into a group

Change-Id: I1c4942cdc474658222ab3ddcd71849150bbc8db4
Signed-off-by: Julien Danjou <julien@danjou.info>
agent-central: use CONF.import_opt rather than import

Change-Id: Ieec4100789cd0d64b36eb6ef7f3b55694a476302
Signed-off-by: Julien Danjou <julien@danjou.info>