lp://staging/~tribaal/charms/trusty/landscape-client/resync-charm-helpers-landscape-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~landscape/charms/trusty/landscape-client/trunk at revision 47

Fernando Correa Neto (community): Approve on 2014-09-29

David Britton (community): Approve on 2014-09-27

Adam Collard (community): Approve on 2014-09-26

Diff: 1471 lines (+1106/-49)

10 files modified

hooks/charmhelpers/core/fstab.py (+116/-0)
hooks/charmhelpers/core/hookenv.py (+132/-7)
hooks/charmhelpers/core/host.py (+100/-12)
hooks/charmhelpers/core/services/__init__.py (+2/-0)
hooks/charmhelpers/core/services/base.py (+313/-0)
hooks/charmhelpers/core/services/helpers.py (+239/-0)
hooks/charmhelpers/core/templating.py (+51/-0)
hooks/charmhelpers/fetch/__init__.py (+102/-25)
hooks/charmhelpers/fetch/archiveurl.py (+49/-4)
hooks/charmhelpers/fetch/bzrurl.py (+2/-1)

api

Superseded for merging into lp://staging/charms/trusty/landscape-client

Adam Collard (community): Needs Resubmitting on 2014-09-26

Landscape: Pending requested 2014-09-26

Diff: 1570 lines (+1131/-51)

14 files modified

hooks/charmhelpers/core/fstab.py (+116/-0)
hooks/charmhelpers/core/hookenv.py (+132/-7)
hooks/charmhelpers/core/host.py (+100/-12)
hooks/charmhelpers/core/services/__init__.py (+2/-0)
hooks/charmhelpers/core/services/base.py (+313/-0)
hooks/charmhelpers/core/services/helpers.py (+239/-0)
hooks/charmhelpers/core/templating.py (+51/-0)
hooks/charmhelpers/fetch/__init__.py (+102/-25)
hooks/charmhelpers/fetch/archiveurl.py (+49/-4)
hooks/charmhelpers/fetch/bzrurl.py (+2/-1)
hooks/common.py (+13/-0)
hooks/hooks.py (+1/-0)
hooks/install.py (+6/-2)
hooks/test_hooks.py (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1346489: apt cache operations have potential for filesystem races

High

Fix Committed

Link a bug report

Related blueprints

46. By Chris Glass on 2014-09-26

Charm-helpers resync.

45. By Free Ekanayaka on 2014-09-02

Merge machine-id-charm-info [r=sparkiegeek,ack]

This branch adds the machine ID to the Juju info
json file, so it can be grabbed by the client
and sent to the server at registration.

44. By Chris Glass on 2014-08-28

Merge lp:~tribaal/charms/trusty/landscape-client/fix-unit-tests-take-two [r=free, sparkiegeek]

43. By Chris Glass on 2014-08-22

Merging lp:~tribaal/charms/trusty/landscape-client/put-install-hook-in-its-own-file [r=sparkiegeek, fcorrea]

This moves the install hook to its own file to prevent import problems.

42. By Chris Glass on 2014-08-15

Merge lp:~tribaal/charms/trusty/landscape-client/add-sync-makefile-target [r=ack, dpb]

41. By Chris Glass on 2014-08-15

Merging lp:~jose/charms/precise/landscape-client/readme-to-markdown [r=dpb, tribaal][f=1239576]

40. By Chris Glass on 2014-06-23

Merge lp:~tribaal/charms/trusty/landscape-client/additional-logging [r=sparkiegeek, free]

39. By Adam Collard on 2014-06-16

Merged landscape-client-multiple-juju-files [r=danilo,tealeg] [f=1325599].

Let the charm output several juju-info JSON files instead of a single file, since the landscape client charm can be deployed to several machines that are "hulk-smashed" together on the same physical machine.

38. By Chris Glass on 2014-06-12

Merge changes from the ~landscape/charms/landscape-client/trunk branch.

37. By Adam Collard on 2014-03-10

Merged ssl-certificate-confusion [r=tribaal,ack] [f=1287711].

Ensure that we always try to decode the base64 encoded ssl key whenever we write the configuration, not just in registration-relation-{joined,changed}