Fix regressions in unit test merge

Unit tests failed to run when Ming is available. This was
not caught in Jenkins because Ming has been removed from
test-requirements.

Change-Id: I048e614046071da8038e5e43815fbb7596106c6f
Added upper version boundry for six

The 1.4.0 version of six is not compatible with WSME 0.5b2.

This fixed bug #1219694.

Change-Id: Ifecf321865c98990b049d5df5de23eb1c90fd6c4
(cherry picked from commit 4e3351bc250a0b6278d71c4e6b88a147a9c762f5)
Merge "Fix regressions in unit test merge" into stable/grizzly
Catch exceptions from nova client in poll_and_publish

Ceilometer compute agent dies if nova client raises an exception while it is
retrieving server instances. This might happen e.g. when some OpenStack API is
temporarily unavailable

Conflicts:
	tests/agentbase.py
	tests/compute/test_manager.py

Fixes LP Bug #1218889
Change-Id: I808dcfae18d23240f8e095d6c97c8dede7dede8f
(cherry picked from commit 0e01da763ab7b3783ae86aa6582c38ebdc6e2378)
Consume notification from the default queue

Closes-Bug: #1209198

(cherry picked from commit 4c4434de205600ed7f510a984445053dc46c60c4)

Conflicts:
	doc/source/install/manual.rst

Change-Id: I4fe5d269b0055206729d68b1f6b4ef7d39e88f23
keystone client changes in AuthProtocol made our test cases failing

class AuthProtocol from python-keystoneclient project has been
changed. It no longer has the member auth_protocol, auth_port and
auth_host, our test cases need to be changed to test against other
members like auth_uri.

Change-Id: I3af86bb773fef80054bb0ad3820e1b8510bf67cb
fixes: bug #1231491
(cherry picked from commit 20dd735694f1f913fec83f2ae679aedc57379716)
Don't publish samples if resource_id in missing

In swift API, the user can call uri without the resource_id.
This patch skip the samples publishing instead of raising the
exception:

Traceback (most recent call last):
File "ceilometer/objectstore/swift_middleware.py", line 109, in iter_response
    bytes_sent)
File "ceilometer/objectstore/swift_middleware.py", line 160, in publish_sample
    resource_id=account.partition('AUTH_')[2],
AttributeError: 'NoneType' object has no attribute 'partition'

It print the exception of the samples publishing failure instead of
raising a exception to never break the swift API.

Fixes bug #1223259

Change-Id: I5d90fa620c8f8ea82e86524b9703049257ca0345
(cherry picked from commit e52e5070b3e0fb8c71e806eda036631e25628800)
Fix get_resources timestamp ordering for SQLAlchemy

This patch ports over the ResourceTestOrdering tests from
Ceilometer Master (Havana-3 RC-1) and applies them to the
SQLAlchemy driver for stable/grizzly along with a fix.
Partial cherry-pick from
change ID Ib09e21cbc7bbd45a6ecc321403e9947df837e14b.

Change-Id: If2d4299d17afc2d0d29433fcdccdfd5d85498cef
Partial-Bug: #1229395
Fixes two typos in this measurements.rst

Adds "s" for two meters "disk.read.request" and "disk.write.request"
modified:   doc/source/measurements.rst

Fixes bug #1220176

Change-Id: I45295e76ac49e4bad1253c5dca9d8ed65e5764e3
(cherry picked from commit 472312a1622ea0e63324b251f5117f47ca6fee1f)
Merge "Fix get_resources timestamp ordering for SQLAlchemy" into stable/grizzly
Merge "Don't publish samples if resource_id in missing" into stable/grizzly
Merge "Fixes two typos in this measurements.rst" into stable/grizzly
Remove upper bound on six dependency version

The upper bound on the six dependency version conflicts with the
lower bound on the transitive six dependency pulled in via the
latest 0.4.1 keystoneclient.

(We also increase the lower bound on the WSME dependency version
to avoid a potential conflict between six 1.4.x and WSME 0.5b2)

Change-Id: I4f00ff756e80397b6c3829b482c3b074b47824df
Pin Sphinx to <1.2

1.2 was just released and has a bug that causes builds to fail with
the error:

  error: 'source_dir' must be a directory name (got `...doc/source`)

See: http://bugs.python.org/issue19570
and: https://bitbucket.org/birkenfeld/sphinx/pull-request/193/builddoc-shouldnt-fail-on-unicode-paths/diff

Change-Id: I0487b4eca8f2755b882689289e3cdf429729b1fb
Bump stable/grizzly next version to 2013.1.5

Change-Id: Idb7cf867801b3ea79b42c0376d5cb712a5f1e2cf
ITECO: add ip auto_assigned notifications
ITECO: Add image info to create and delete notifications
ITECO: Add event_type to compute-agent notifications
ITECO: Add event_type to network usage notifications
ITECO: send power state

Signed-off-by: Ivan Kramarev <ivankramarev@gmail.com>