lp://staging/~adam-collard/charms/trusty/landscape-client/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

47. By Adam Collard on 2014-09-26

Merge trunk

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.