lp:~corey.bryant/charms/trusty/heat/contrib.python.packages

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/heat/next at revision 28

OpenStack Charmers: Pending requested 2014-12-10

Diff: 4119 lines (+1747/-575)

32 files modified

charm-helpers.yaml (+1/-0)
hooks/charmhelpers/__init__.py (+22/-0)
hooks/charmhelpers/contrib/hahelpers/apache.py (+10/-3)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+17/-9)
hooks/charmhelpers/contrib/network/ip.py (+212/-35)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+40/-9)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+8/-5)
hooks/charmhelpers/contrib/openstack/context.py (+450/-222)
hooks/charmhelpers/contrib/openstack/ip.py (+41/-27)
hooks/charmhelpers/contrib/openstack/neutron.py (+20/-4)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+25/-12)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+9/-8)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+9/-8)
hooks/charmhelpers/contrib/openstack/templating.py (+5/-5)
hooks/charmhelpers/contrib/openstack/utils.py (+173/-12)
hooks/charmhelpers/contrib/python/packages.py (+77/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+89/-102)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+4/-4)
hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/fstab.py (+10/-8)
hooks/charmhelpers/core/hookenv.py (+83/-31)
hooks/charmhelpers/core/host.py (+81/-25)
hooks/charmhelpers/core/services/__init__.py (+2/-2)
hooks/charmhelpers/core/services/base.py (+3/-0)
hooks/charmhelpers/core/services/helpers.py (+124/-6)
hooks/charmhelpers/core/sysctl.py (+34/-0)
hooks/charmhelpers/core/templating.py (+2/-1)
hooks/charmhelpers/fetch/__init__.py (+37/-17)
hooks/charmhelpers/fetch/archiveurl.py (+99/-17)
hooks/charmhelpers/fetch/bzrurl.py (+5/-1)
hooks/charmhelpers/fetch/giturl.py (+51/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

35. By Corey Bryant on 2014-12-11

Sync charm-helpers and actually pick up charmhelpers/__init__.py this time.

34. By Corey Bryant on 2014-12-11

Remove hooks/charmhelpers/__init__.py and re-sync charm-helpers.

33. By Corey Bryant on 2014-12-11

Remove __init__ from charm-helpers yaml.

32. By Corey Bryant on 2014-12-11

Remove .pyc files from charmhelpers/hooks.

31. By Corey Bryant on 2014-12-11

Sync charm-helpers.

30. By Corey Bryant on 2014-12-11

Add __init__ to charm-helpers sync.

29. By Corey Bryant on 2014-12-10

Sync charm-helpers.

28. By Corey Bryant on 2014-12-10

Add contrib.python.packages to charm-helpers sync.

27. By James Page on 2014-11-17

[jjo,r=james-page] Fix heat encryption key and auth_uri

26. By Liam Young on 2014-08-26

Sync charm helpers