lp:~tribaal/landscape-client/revert-weird-merge-error

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~landscape/landscape-client/trunk at revision 770

Björn Tillenius (community): Approve on 2014-06-11

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

Diff: 566 lines (+248/-84)

10 files modified

landscape/broker/registration.py (+5/-5)
landscape/broker/tests/helpers.py (+4/-1)
landscape/broker/tests/test_registration.py (+56/-6)
landscape/deployment.py (+6/-1)
landscape/lib/juju.py (+37/-17)
landscape/lib/tests/test_juju.py (+80/-22)
landscape/message_schemas.py (+8/-3)
landscape/monitor/jujuinfo.py (+17/-6)
landscape/monitor/tests/test_jujuinfo.py (+30/-18)
landscape/tests/test_deployment.py (+5/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1325599: Landscape-client should allow for several different juju-units on the same machine

High

Fix Released

Link a bug report

Related blueprints

773. By Chris Glass on 2014-06-11

Made ordering rely on the unit-name key.
Added more significant comment when catching Exception.

772. By Chris Glass on 2014-06-11

Test failure fix.

771. By Chris Glass on 2014-06-11

Fixes all inline comments.

770. By Chris Glass on 2014-06-09

Reverted merge from trunk that apparently destroyed most changes the previous branch introduced.

769. By Chris Glass on 2014-06-06

Merge multiple-juju-unit-files [f=1325599] [r=ack,free.ekanayaka] [a=Chris Glass]
This branch creates a juju-info.d/ directory in the landscape-client data path, and reads all files matching *.json in this directory as a separate juju-info file.

It then reports juju-info lists to the server, either in the registration message or using a new message (to send a list of "juju info" instead of just one).

768. By Adam Collard on 2014-06-05

Revert r767 due to broken server imports [r=chad.smith]

bzr merge -r 767..766

767. By Chris Glass on 2014-06-05

Merge multiple-juju-unit-files [f=1325599] [r=ack,free.ekanayaka] [a=Chris Glass]
This branch creates a juju-info.d/ directory in the landscape-client data path, and reads all files matching *.json in this directory as a separate juju-info file.

It then reports juju-info lists to the server, either in the registration message or using a new message (to send a list of "juju info" instead of just one).

766. By Alberto Donato on 2014-05-25

Merge ceph-message-to-ceph-usage [f=1321337] [r=adam-collard,free.ekanayaka] [a=Alberto Donato]
This reverts the message name change for ceph-usage
It preserves backwards compatibility by always sending an empty "ceph-usages" field in the message.

765. By Alberto Donato on 2014-05-25

Merge swift-usage [f=1320236] [r=tribaal,tealeg] [a=Alberto Donato]
This branch replaces the SwiftDeviceInfo plugin with SwiftUsage, which reports free/used/available space for each device in the cluster.
It uses a different message type from the previous plugin.

764. By Alberto Donato on 2014-05-19

Merge ceph-usage-report-bytes [f=1319782] [r=adam-collard,benji] [a=Alberto Donato]
This makes the ceph plugin report total/used/available space (in Mb) in the ring, instead of the usage.
It uses a new "ceph" message type in place of "ceph-usage", which will be eventually dropped.