← Back to branch summary

~hopem/charms/trusty/glance/ceph-broker

~hopem/charms/trusty/glance/ceph-broker

Viewing all changes in revision 86.

Committer: Edward Hope-Morley
Date: 2014-11-20 00:17:01 UTC
mfrom: (78.1.2 glance.next)
Revision ID: edward.hope-morley@canonical.com-20141120001701-6ilzzbr0d4qn1tv2

fixed conflicts

files added:
hooks/charmhelpers/fetch/giturl.py

files removed:
hooks/charmhelpers/fetch/giturl.py

files modified:
config.yaml

hooks/glance_utils.py

templates/icehouse/glance-api.conf

templates/icehouse/glance-registry.conf

templates/juno/glance-api.conf

Show diffs side-by-side

added added

removed removed

hooks/charmhelpers/fetch/giturl.py

hooks/charmhelpers/fetch/giturl.py

hooks/glance_utils.py

templates/icehouse/glance-api.conf

templates/icehouse/glance-registry.conf

templates/juno/glance-api.conf

Older »