lp:~adam-collard/landscape-client/sock-in-panel

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Geoff Teale (community): Approve on 2014-06-13

Diff: 105 lines (+40/-48)

1 file modified

icons/preferences-management-service.svg (+40/-48)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1317928: Update the landscape icon used in the system panel.

High

Fix Released

Link a bug report

Related blueprints

771. By Adam Collard on 2014-06-13

Add new Landscape logo for Ubuntu Control Centre.

770. By Chris Glass on 2014-06-11

Merge revert-weird-merge-error [f=1325599] [r=bjornt,ack] [a=Chris Glass]
This is basically a resubmit of https://code.launchpad.net/~tribaal/landscape-client/multiple-juju-unit-files
since the last merge of trunk in this branch just before landing seems to have
reverted all meaningful changes.

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.

763. By Andreas Hasenack on 2014-05-06

Bump client version to 14.04 [trivial]

762. By Benji York on 2014-05-01

Merge bug-1306824-add-processor-info-reader-for-aarch64 [f=1306824] [r=bjornt,adam-collard] [a=Benji York]
The 64-bit ARMv8 architechture has "aarm64" reported as its machine name, which
didn't match the ARM regex.

This branch adds a test that generated the error and a tweaked regex that
recognizes the machine name.