lp:~gandelman-a/charms/precise/glance/merge_resolve_conflicts

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers/charms/precise/glance/ha-support at revision 53

Andres Rodriguez (community): Approve on 2013-06-03

Diff: 192 lines (+69/-77)

3 files modified

hooks/glance-common (+24/-65)
hooks/glance-relations (+13/-12)
hooks/lib/openstack-common (+32/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

33. By Adam Gandelman on 2013-06-03

Resolve conflicts, merge Grizzly + HA work.

32. By Mark Mims on 2013-03-12

merging lp:~gandelman-a/charms/precise/glance/cfgparser

31. By Adam Gandelman on 2013-03-05

Ceph mon_hosts fix.

30. By Adam Gandelman on 2013-01-30

Ensure glance-api.conf's sql_conn is updated for all releases > essex.

29. By Adam Gandelman on 2013-01-11

Sync openstack-common.

28. By Adam Gandelman on 2013-01-11

Sync openstack-common.

27. By Adam Gandelman on 2013-01-09

Merge two small fixes for deb src handling and missing object-store relations.

26. By Adam Gandelman on 2012-12-19

Merge post-Diablo swift support.

25. By Adam Gandelman on 2012-12-19

Only attempt upgrade detection from known installation sources.

24. By Adam Gandelman on 2012-11-29

Merge fixes for handling of deb source URLs.