lp:~openstack-charmers/charms/precise/cinder/ods_merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charms/raring/cinder at revision 27

Marco Ceppi (community): Abstain on 2013-11-11

OpenStack Charmers: Pending requested 2013-11-11

Diff: 847 lines (+297/-54)

9 files modified

hooks/charmhelpers/contrib/openstack/context.py (+20/-1)
hooks/charmhelpers/contrib/openstack/neutron.py (+20/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+81/-10)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+27/-3)
hooks/charmhelpers/core/hookenv.py (+78/-23)
hooks/charmhelpers/core/host.py (+15/-9)
hooks/charmhelpers/fetch/__init__.py (+53/-5)
hooks/charmhelpers/fetch/bzrurl.py (+1/-1)
hooks/cinder_contexts.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

29. By James Page on 2013-11-08

Rebase on trunk

28. By Adam Gandelman on 2013-11-06

Update and sync helpers.

27. By James Page on 2013-11-01

HAProxy != ceph interface

26. By James Page on 2013-11-01

Remove duped ceph interface is preference to real one to stop hook failures

25. By Adam Gandelman on 2013-10-23

Update icon.svg

24. By Adam Gandelman on 2013-10-20

[james-page] Improved unit testing coverage

23. By Adam Gandelman on 2013-10-17

Merging python-redux and havana work.

22. By Adam Gandelman on 2013-09-24

[hopem] Added ceph-osd-replication-count config and pg settings.

21. By Adam Gandelman on 2013-06-03

Support for Grizzly. Support for HA.

20. By Marco Ceppi on 2013-04-26

Added icon.svg