lp://qastaging/~james-page/charms/trusty/ceilometer/network-splits

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/next at revision 50

Liam Young (community): Approve on 2014-07-29

Diff: 1464 lines (+870/-95)

22 files modified

.bzrignore (+2/-0)
Makefile (+15/-6)
charm-helpers.yaml (+1/-0)
config.yaml (+23/-0)
hooks/ceilometer_hooks.py (+23/-6)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+3/-2)
hooks/charmhelpers/contrib/network/ip.py (+156/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+55/-0)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+209/-0)
hooks/charmhelpers/contrib/openstack/context.py (+82/-20)
hooks/charmhelpers/contrib/openstack/ip.py (+75/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+14/-0)
hooks/charmhelpers/contrib/openstack/templating.py (+22/-23)
hooks/charmhelpers/contrib/openstack/utils.py (+5/-2)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1)
hooks/charmhelpers/contrib/storage/linux/utils.py (+1/-0)
hooks/charmhelpers/core/fstab.py (+116/-0)
hooks/charmhelpers/core/hookenv.py (+5/-4)
hooks/charmhelpers/core/host.py (+32/-12)
hooks/charmhelpers/fetch/__init__.py (+24/-16)
hooks/charmhelpers/fetch/bzrurl.py (+2/-1)
unit_tests/test_ceilometer_hooks.py (+4/-2)

api

Superseded for merging into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/trunk

charmers: Pending requested 2014-07-24

Diff: 1941 lines (+1145/-167)

23 files modified

.bzrignore (+2/-0)
Makefile (+15/-6)
charm-helpers.yaml (+1/-0)
config.yaml (+23/-0)
hooks/ceilometer_hooks.py (+23/-6)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+3/-2)
hooks/charmhelpers/contrib/network/ip.py (+156/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+55/-0)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+209/-0)
hooks/charmhelpers/contrib/openstack/context.py (+83/-21)
hooks/charmhelpers/contrib/openstack/ip.py (+75/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+31/-1)
hooks/charmhelpers/contrib/openstack/templating.py (+22/-23)
hooks/charmhelpers/contrib/openstack/utils.py (+19/-4)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1)
hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-1)
hooks/charmhelpers/contrib/storage/linux/utils.py (+29/-5)
hooks/charmhelpers/core/fstab.py (+116/-0)
hooks/charmhelpers/core/hookenv.py (+103/-5)
hooks/charmhelpers/core/host.py (+42/-8)
hooks/charmhelpers/fetch/__init__.py (+130/-81)
hooks/charmhelpers/fetch/bzrurl.py (+2/-1)
unit_tests/test_ceilometer_hooks.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

60. By James Page on 2014-07-24

Resync to trunk helpers

59. By James Page on 2014-07-15

Resync helpers

58. By James Page on 2014-07-04

Use new canonical_url helper

57. By James Page on 2014-07-04

Resync helpers

56. By James Page on 2014-07-02

Resync helpers

55. By James Page on 2014-07-02

Resync helpers

54. By James Page on 2014-07-02

Tidy makefile

53. By James Page on 2014-07-02

Fixup publish targets

52. By James Page on 2014-07-02

Resync helpers

51. By James Page on 2014-06-27

Resync helpers