openstack
/
charm-trove
Code Issues Proposed changes

Resolved conflicts

This commit is contained in:
jarrance 2016-10-10 11:59:27 -04:00
parent 4736f9e3f7
commit 76470bb013
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/charm/openstack/trove.py
View File

@ -158,11 +158,6 @@ class TroveCharm(charms_openstack.charm.HAOpenStackCharm):
services = ['trove-api', 'trove-taskmanager', 'trove-conductor']
<<<<<<< HEAD
# not sure if this will work or not
=======
>>>>>>> ca231bdf27b8d3e8e28a0bb40f20d06dea8e7340
#adapters_class = charms_openstack.adapters.OpenStackAPIRelationAdapters
adapters_class = TroveAdapters
default_service = 'trove-api'