MAAS

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

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

Commit message

Revert "LP: #1869116 - Read storage model data from udev ID_MODEL_ENC. (gh:lxc/lxd:7665)"

This reverts commit 511d6314eb90c804d484c48afbd1bdcc23e91efe.

To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) wrote :

As discussed in team stand up reverting this for now to get the RC out, will add back later.

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 a754c82..afd1fb4 100644
3--- a/src/machine-resources/src/machine-resources/Gopkg.lock
4+++ b/src/machine-resources/src/machine-resources/Gopkg.lock
5@@ -2,16 +2,33 @@
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 version = "0.5.0"
25
26 [[projects]]
27+ name = "github.com/juju/errors"
28+ packages = ["."]
29+ revision = "3fe23663418fc1d724868c84f21b7519bbac7441"
30+
31+[[projects]]
32 branch = "master"
33 name = "github.com/lxc/lxd"
34- packages = ["lxd/resources","shared/api","shared/units","shared/usbid"]
35- revision = "44487eda6756305828ea8aaf7555225f61d1d292"
36+ packages = ["lxd/resources","shared","shared/api","shared/cancel","shared/ioprogress","shared/logger","shared/osarch","shared/units","shared/usbid","shared/version"]
37+ revision = "6c2d0d039346d2e2b524e1b9bd207be182abe0a6"
38
39 [[projects]]
40 name = "github.com/mitchellh/go-homedir"
41@@ -28,9 +45,15 @@
42 [[projects]]
43 branch = "master"
44 name = "golang.org/x/sys"
45- packages = ["unix"]
46+ packages = ["unix","windows"]
47 revision = "b09406accb4736d857a32bf9444cd7edae2ffa79"
48
49+[[projects]]
50+ branch = "v2"
51+ name = "gopkg.in/robfig/cron.v2"
52+ packages = ["."]
53+ revision = "be2e0b0deed5a68ffee390b4583a13aff8321535"
54+
55 [solve-meta]
56 analyzer-name = "dep"
57 analyzer-version = 1

Subscribers

People subscribed via source and target branches