Merge ~troyanov/maas:update-lxd-backport-to-3.2 into maas:3.2

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 01acca3f9dce600cc740338fe0ad4f54164e4362
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:update-lxd-backport-to-3.2
Merge into: maas:3.2
Diff against target: 65 lines (+17/-14)
2 files modified
src/host-info/go.mod (+5/-4)
src/host-info/go.sum (+12/-10)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
MAAS Maintainers Pending
Review via email: mp+426669@code.launchpad.net

Commit message

fix(deps): update github.com/lxc/lxd to v0.0.0-20220711133913-8b2bcb6dc937

Fixes bug LP:1980490

(cherry picked from commit 3a53bad07ec621902c2489daf8523d0977e274a7)

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b update-lxd-backport-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/20/consoleText
COMMIT: 01acca3f9dce600cc740338fe0ad4f54164e4362

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b update-lxd-backport-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/21/consoleText
COMMIT: 01acca3f9dce600cc740338fe0ad4f54164e4362

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b update-lxd-backport-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 01acca3f9dce600cc740338fe0ad4f54164e4362

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/host-info/go.mod b/src/host-info/go.mod
2index 049cee1..9d79202 100644
3--- a/src/host-info/go.mod
4+++ b/src/host-info/go.mod
5@@ -2,7 +2,7 @@ module host-info
6
7 go 1.18
8
9-require github.com/lxc/lxd v0.0.0-20220514153915-f381aadd178a
10+require github.com/lxc/lxd v0.0.0-20220711133913-8b2bcb6dc937
11
12 require (
13 github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
14@@ -16,7 +16,8 @@ require (
15 github.com/pborman/uuid v1.2.1 // indirect
16 github.com/robfig/cron/v3 v3.0.1 // indirect
17 github.com/sirupsen/logrus v1.8.1 // indirect
18- golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
19- golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
20- golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
21+ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
22+ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect
23+ golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
24+ golang.org/x/text v0.3.7 // indirect
25 )
26diff --git a/src/host-info/go.sum b/src/host-info/go.sum
27index 1ca4107..b3041fb 100644
28--- a/src/host-info/go.sum
29+++ b/src/host-info/go.sum
30@@ -18,8 +18,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C
31 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
32 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
33 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
34-github.com/lxc/lxd v0.0.0-20220514153915-f381aadd178a h1:mG9xCdUmZ3HwDTTDiXMP8fzJ5TMMO80HbzWBJk9tzTE=
35-github.com/lxc/lxd v0.0.0-20220514153915-f381aadd178a/go.mod h1:isY3N0YJG/WLpyLn8HUNmeaOhT+uD6Ci7Z1SEtY/CMU=
36+github.com/lxc/lxd v0.0.0-20220711133913-8b2bcb6dc937 h1:OS0W4c2p+2ihnSGRCvY+NH3GpBVxar1Rgm/0r0d4KQc=
37+github.com/lxc/lxd v0.0.0-20220711133913-8b2bcb6dc937/go.mod h1:hoRkk9Stjq4o+4gCbjZNh9p4tisiB8SS6xK63PzeikM=
38 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
39 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
40 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
41@@ -33,14 +33,16 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG
42 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
43 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
44 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
45-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
46-golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 h1:NUzdAbFtCJSXU20AOXgeqaUwg8Ypg4MPYmL+d+rsB5c=
47-golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
48+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
49+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
50+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
51 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
52-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a h1:N2T1jUrTQE9Re6TFF5PhvEHXHCguynGhKjWVsIUt5cY=
53-golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
54-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8=
55-golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
56+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo=
57+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
58+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
59+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
60+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
61+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
62 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
63 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
64-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
65+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

Subscribers

People subscribed via source and target branches