5f01d9108d
Related-bug: #1504495
The conflicts is just a useless additional import.
Conflicts:
aodh/tests/functional/gabbi/fixtures.py
Change-Id: I8de76d9229fc5e5b3dd74a11067258ea9cc4616b
(cherry picked from commit
|
||
---|---|---|
.. | ||
api | ||
gabbi | ||
hooks | ||
storage | ||
__init__.py | ||
db.py |