lp://staging/~free.ekanayaka/charms/trusty/landscape-client/drop-unit-name-from-juju-info

Branch merges

Propose for merging

No branches dependent on this one.

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

Chris Glass (community): Approve on 2014-09-25

Alberto Donato: Approve on 2014-09-24

Diff: 229 lines (+25/-68)

3 files modified

hooks/common.py (+4/-8)
hooks/hooks.py (+11/-28)
hooks/test_hooks.py (+10/-32)

api

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

Landscape: Pending requested 2014-09-24

Landscape: Pending requested 2014-09-24

Diff: 251 lines (+40/-54)

4 files modified

hooks/common.py (+17/-8)
hooks/hooks.py (+5/-21)
hooks/install.py (+6/-2)
hooks/test_hooks.py (+12/-23)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

47. By Free Ekanayaka on 2014-09-25

Drop private-address from juju-info

46. By Free Ekanayaka on 2014-09-24

Drop unit name from the juju info json file

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.