Updated openstack/openstack
Project: openstack/cinder  f7230d683bb3dac94b75e5dc12f4b5c16face7aa
null
Cast the quota set values to integer before checking their validity

Closes-Bug: #1280159
(cherry picked from commit a444ca8646103042d665536796168252a8ca1031)

Conflicts:
	cinder/api/contrib/quotas.py

Change-Id: I56409607d435a5e2ff702ccb9f19c5d12b432570
Updated openstack/openstack
Project: openstack/requirements  b4e6361ad2b254fcad25d86c609e6268dee7868c
null
Unwedge stable branch: stop syncing trove and fix pypy

Remove trove from requirements sync in havana. Trove wasn't actually
part of the integrated release in havana,
so it's not getting actively maintained on the backports. Remove
it from requirements sync to help unwedge stable.

pypy is blocking all requirements merge at the moment, which is
problematic as we've got some changes that should land prior to
icehouse. Implement the work around that fungi posted to IRC by
backporting the tox.ini from master.

Depends on: Iab4ae1efddc4dca38dcd3779dae1a79ddc2b0852

Co-Authored-By: Sean Dague <sean.dague@samsung.com>
Co-Authored-By: Sergey Lukjanov <slukjanov@mirantis.com>
Change-Id: Ib2e2aa2e75e7b7b43e0534eeb62e748d1edc0bc3