MAAS

Merge ~ltrager/maas:lp1877220_2.7 into maas:2.7

  1. Git
  2. lp:~ltrager/maas
  3. lp1877220_2.7
  4. Merge into 2.7
Proposed by Lee Trager
Status: Merged
Approved by: Lee Trager
Approved revision: ce5c378fe362079fa6c0daf24354513ded4c51b2
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ltrager/maas:lp1877220_2.7
Merge into: maas:2.7
Diff against target: 51 lines (+21/-3)
1 file modified
src/machine-resources/src/machine-resources/Gopkg.lock (+21/-3)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Needs Fixing
Review via email: mp+383619@code.launchpad.net

Commit message

LP: #1877220 - Update LXD to fix probing NVME multipath devices(GH:7313)

Description of the change

This is not a backport as I'll be fixing this with LP:1876217 in master

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

UNIT TESTS
-b lp1877220_2.7 lp:~ltrager/maas/+git/maas into -b 2.7 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7499/console
COMMIT: ce5c378fe362079fa6c0daf24354513ded4c51b2

review: Needs Fixing
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/machine-resources/src/machine-resources/Gopkg.lock b/src/machine-resources/src/machine-resources/Gopkg.lock
2index 0ac537d..a96f98c 100644
3--- a/src/machine-resources/src/machine-resources/Gopkg.lock
4+++ b/src/machine-resources/src/machine-resources/Gopkg.lock
5@@ -2,6 +2,18 @@
6
7
8 [[projects]]
9+ name = "github.com/flosch/pongo2"
10+ packages = ["."]
11+ revision = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"
12+ version = "v3.0"
13+
14+[[projects]]
15+ name = "github.com/gorilla/websocket"
16+ packages = ["."]
17+ revision = "b65e62901fc1c0d968042419e74789f6af455eb9"
18+ version = "v1.4.2"
19+
20+[[projects]]
21 name = "github.com/jaypipes/pcidb"
22 packages = ["."]
23 revision = "49e68a8beb0c155efb2db43bea4b354ec4843ff1"
24@@ -10,8 +22,8 @@
25 [[projects]]
26 branch = "master"
27 name = "github.com/lxc/lxd"
28- packages = ["lxd/resources","shared/api","shared/units","shared/usbid"]
29- revision = "b85a3ffa846e1ceb9fc091fa9bd5f20f4aa2d7b2"
30+ packages = ["lxd/resources","shared","shared/api","shared/cancel","shared/ioprogress","shared/logger","shared/units","shared/usbid"]
31+ revision = "7b12be0dc6b099dffc369299af2803a77611fc8d"
32
33 [[projects]]
34 name = "github.com/mitchellh/go-homedir"
35@@ -28,9 +40,15 @@
36 [[projects]]
37 branch = "master"
38 name = "golang.org/x/sys"
39- packages = ["unix"]
40+ packages = ["unix","windows"]
41 revision = "b09406accb4736d857a32bf9444cd7edae2ffa79"
42
43+[[projects]]
44+ branch = "v2"
45+ name = "gopkg.in/robfig/cron.v2"
46+ packages = ["."]
47+ revision = "be2e0b0deed5a68ffee390b4583a13aff8321535"
48+
49 [solve-meta]
50 analyzer-name = "dep"
51 analyzer-version = 1

Subscribers

People subscribed via source and target branches