lp:~ubuntu-mate-dev/landscape-client/show-in-mate

Branch merges

Propose for merging

No branches dependent on this one.

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

Geoff Teale (community): Approve on 2015-07-21

Chris Glass (community): Approve on 2015-07-21

Ubuntu Sponsors: Pending requested 2015-07-20

Diff: 12 lines (+1/-1)

1 file modified

applications/landscape-client-settings.desktop.in (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1653929: Landscape Client UI should show in MATE

Low

Fix Committed

Link a bug report

Related blueprints

823. By Martin Wimpress  on 2015-07-20

Show in MATE.

822. By Alberto Donato on 2015-06-08

Merge multi-curl-test-fix [f=1462427] [r=adam-collard,free.ekanayaka] [a=Alberto Donato]
Fix a flaky CURL-related test.
The MultiCurlStub wasn't really thread-safe, so it could break when used with fetch_many_async.

821. By David Britton on 2015-06-03

Change UPSTREAM_VERSION to 15.06 [trivial]

820. By David Britton on 2015-06-02

Update changelog for 15.06 release [trivial] [r=andreas]

819. By Alberto Donato on 2015-05-08

Merge fix-vivid-lxc-detection [f=1449920] [r=tealeg,fcorrea] [a=Alberto Donato]
This fixes container detection on Vivid hosts.
With the switch to systemd, the /run/container_type is no longer created (unless init-system-helpers is installed), so container detection fails.

The same information is also available in /run/systemd/container, so the branch also checks for that file.

818. By Free Ekanayaka on 2015-05-01

Remove time-dependent test [trivial] [r=adam-collard]

817. By Björn Tillenius on 2015-04-16

Merge systemerror-no-retry [f=1444419] [r=chad.smith,ack] [a=Björn Tillenius]
Don't retry package operations if a SystemError is raised, since a
SystemError is most likely a permanent error and retrying won't help.

The original patch to retry the operation was to handle lock errors,
which are still properly retried with this branch.

816. By David Britton on 2015-04-01

Enable tarmac auto set milestone feature [r=sparkiegeek] [trivial]

815. By Chris Glass on 2015-03-25

Merge take-two-1434546-exit-code-2-on-error [f=1434546] [r=ack,benji] [a=Chris Glass]
Restore behavior of the program exiting with a non-zero exit code in case of
error during registration (specifically, "2").

814. By Chris Glass on 2015-03-20

Merge fix-1429888-wrong-credentials-stacktrace [f=1429888] [r=bjornt,adam-collard] [a=Chris Glass]
This branch fixes the related bug, where inappropriate account/password combinations made client registration badly.