snapweb

Merge lp:~stevenwilkin/snapweb/rename-snapd-import into lp:~snappy-dev/snapweb/trunk

  1. rename-snapd-import
  2. Merge into trunk
Proposed by Steven Wilkin
Status: Merged
Approved by: Steven Wilkin
Approved revision: 190
Merged at revision: 190
Proposed branch: lp:~stevenwilkin/snapweb/rename-snapd-import
Merge into: lp:~snappy-dev/snapweb/trunk
Diff against target: 122 lines (+12/-12)
9 files modified
dependencies.tsv (+1/-1)
snappy/common_test.go (+1/-1)
snappy/converge.go (+2/-2)
snappy/converge_test.go (+2/-2)
snappy/handlers.go (+2/-2)
snappy/icon_test.go (+1/-1)
snappy/snapd_client.go (+1/-1)
statustracker/statustracker.go (+1/-1)
statustracker/statustracker_test.go (+1/-1)
To merge this branch: bzr merge lp:~stevenwilkin/snapweb/rename-snapd-import
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Review via email: mp+295619@code.launchpad.net

Commit message

Snappy dependencies have been moved

Description of the change

Snappy dependencies have been moved

To post a comment you must log in.
Revision history for this message
Leo Arias (elopio) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dependencies.tsv'
2--- dependencies.tsv 2016-05-18 14:22:38 +0000
3+++ dependencies.tsv 2016-05-24 18:39:23 +0000
4@@ -7,7 +7,7 @@
5 github.com/miekg/dns git 5a357a6fc5e85268b929350aa6423e2d56dcc4ff 2015-04-18T05:52:30Z
6 github.com/mvo5/goconfigparser git 26426272dda20cc76aa1fa44286dc743d2972fe8 2015-02-12T09:37:50Z
7 github.com/mvo5/uboot-go git 69978a3e4b05cca9d7cfee489b3453dfed45e72c 2015-07-23T08:17:10Z
8-github.com/ubuntu-core/snappy git 1400bc098c675ab5ec6a885be6b1f67273e1bf3a 2016-05-14T20:32:33Z
9+github.com/snapcore/snapd git ea2cc34014d0a49c946971ef20acc23e5dd3ca76 2016-05-24T18:06:34Z
10 golang.org/x/crypto git 60052bd85f2d91293457e8811b0cf26b773de469 2015-06-22T23:34:07Z
11 gopkg.in/check.v1 git 64131543e7896d5bcc6bd5a76287eb75ea96c673 2014-10-24T13:38:53Z
12 gopkg.in/yaml.v2 git 49c95bdc21843256fb6c4e0d370a05f24a0bf213 2015-02-24T22:57:58Z
13
14=== modified file 'snappy/common_test.go'
15--- snappy/common_test.go 2016-05-18 19:55:24 +0000
16+++ snappy/common_test.go 2016-05-24 18:39:23 +0000
17@@ -20,7 +20,7 @@
18 import (
19 "testing"
20
21- "github.com/ubuntu-core/snappy/client"
22+ "github.com/snapcore/snapd/client"
23
24 . "gopkg.in/check.v1"
25 )
26
27=== modified file 'snappy/converge.go'
28--- snappy/converge.go 2016-05-19 12:07:39 +0000
29+++ snappy/converge.go 2016-05-24 18:39:23 +0000
30@@ -22,8 +22,8 @@
31
32 "log"
33
34- "github.com/ubuntu-core/snappy/client"
35- "github.com/ubuntu-core/snappy/snap"
36+ "github.com/snapcore/snapd/client"
37+ "github.com/snapcore/snapd/snap"
38 )
39
40 const (
41
42=== modified file 'snappy/converge_test.go'
43--- snappy/converge_test.go 2016-05-19 12:07:39 +0000
44+++ snappy/converge_test.go 2016-05-24 18:39:23 +0000
45@@ -21,8 +21,8 @@
46 "errors"
47 "os"
48
49- "github.com/ubuntu-core/snappy/client"
50- "github.com/ubuntu-core/snappy/snap"
51+ "github.com/snapcore/snapd/client"
52+ "github.com/snapcore/snapd/snap"
53 . "gopkg.in/check.v1"
54 "launchpad.net/webdm/statustracker"
55 )
56
57=== modified file 'snappy/handlers.go'
58--- snappy/handlers.go 2016-05-19 12:07:39 +0000
59+++ snappy/handlers.go 2016-05-24 18:39:23 +0000
60@@ -23,8 +23,8 @@
61 "log"
62 "net/http"
63
64- "github.com/ubuntu-core/snappy/client"
65- "github.com/ubuntu-core/snappy/snappy"
66+ "github.com/snapcore/snapd/client"
67+ "github.com/snapcore/snapd/snappy"
68 "launchpad.net/webdm/statustracker"
69
70 "github.com/gorilla/mux"
71
72=== modified file 'snappy/icon_test.go'
73--- snappy/icon_test.go 2016-04-26 10:22:35 +0000
74+++ snappy/icon_test.go 2016-05-24 18:39:23 +0000
75@@ -23,7 +23,7 @@
76 "os"
77 "path/filepath"
78
79- "github.com/ubuntu-core/snappy/client"
80+ "github.com/snapcore/snapd/client"
81
82 . "gopkg.in/check.v1"
83 )
84
85=== modified file 'snappy/snapd_client.go'
86--- snappy/snapd_client.go 2016-05-18 19:55:24 +0000
87+++ snappy/snapd_client.go 2016-05-24 18:39:23 +0000
88@@ -18,7 +18,7 @@
89 package snappy
90
91 import (
92- "github.com/ubuntu-core/snappy/client"
93+ "github.com/snapcore/snapd/client"
94 )
95
96 type snapdClient interface {
97
98=== modified file 'statustracker/statustracker.go'
99--- statustracker/statustracker.go 2016-04-26 10:22:35 +0000
100+++ statustracker/statustracker.go 2016-05-24 18:39:23 +0000
101@@ -28,7 +28,7 @@
102 "sync"
103 "time"
104
105- "github.com/ubuntu-core/snappy/client"
106+ "github.com/snapcore/snapd/client"
107 )
108
109 const (
110
111=== modified file 'statustracker/statustracker_test.go'
112--- statustracker/statustracker_test.go 2016-04-25 08:28:22 +0000
113+++ statustracker/statustracker_test.go 2016-05-24 18:39:23 +0000
114@@ -21,7 +21,7 @@
115 "testing"
116 "time"
117
118- "github.com/ubuntu-core/snappy/client"
119+ "github.com/snapcore/snapd/client"
120
121 . "gopkg.in/check.v1"
122 )

Subscribers

People subscribed via source and target branches