Updated openstack/openstack
Project: openstack/cinder  49bd90c58df0546915dd1259ba84fdb6e74d4d25
null
Netapp iscsi: allow snapshots with unspecified block range.

Snapshots were failing to create in all cases in the NetApp iscsi
driver. The clone lun function was never issuing the zapi call
because the block count was set to 0.

Closes-Bug: 1296881

Change-Id: Ic2bf67b57a566632103a3fa2ff032555f42a3961
Updated openstack/openstack
Project: openstack/ceilometer  f55fcc0e77f2e94fab4acbc320dd9d962f72bf96
null
Ensure idempotency of cardinality reduction in mongo

Fixes bug 1297004

Previously, the reduce function for the cardinality aggregate was not
idempotent with respect to partially-reduced values.  This led to the
cardinality value being inaccuarate when the size of the mapped set
caused mongo to call reduce in multiple stages.

Now, the reduce function respects the implicit idempotency requirement.

Change-Id: Ia1e5f8dad43a9afbba8bace610e0d6574fb579cc