Created by Adam Gandelman on 2013-06-03 and last modified on 2013-06-03
Get this branch:
bzr branch lp:~gandelman-a/charms/precise/glance/merge_resolve_conflicts
Only Adam Gandelman can upload to this branch. If you are Adam Gandelman please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Adam Gandelman

Recent revisions

33. By Adam Gandelman on 2013-06-03

Resolve conflicts, merge Grizzly + HA work.

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.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.