lp:~free.ekanayaka/charms/trusty/landscape-client/machine-id-charm-info

Branch merges

Propose for merging

No branches dependent on this one.

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

Alberto Donato (community): Approve on 2014-09-02

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

Diff: 98 lines (+25/-2)

4 files modified

hooks/common.py (+13/-0)
hooks/hooks.py (+1/-0)
hooks/install.py (+6/-2)
hooks/test_hooks.py (+5/-0)

api

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

Adam Collard: Approve on 2014-09-02

Alberto Donato (community): Approve on 2014-09-01

Diff: 98 lines (+25/-2)

4 files modified

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

Related blueprints

48. By Free Ekanayaka on 2014-09-02

Fix typo

47. By Free Ekanayaka on 2014-09-02

Fix formatting

46. By Free Ekanayaka on 2014-09-01

Address review comments

45. By Free Ekanayaka on 2014-08-28

Write Juju machine ID

44. By Free Ekanayaka on 2014-08-28

Merge from trunk

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.