Merge proposals dependent on lp://qastaging/~charmers/charms/precise/ceph/trunk

lp://qastaging/~charmers/charms/precise/ceph/trunk has no merge proposals.