Go OpenStack Exchange

Merge lp:~gophers/goose/unstable-001 into lp:~gophers/goose/trunk

  1. unstable-001
  2. Merge into trunk
Proposed by John A Meinel
Status: Rejected
Rejected by: John A Meinel
Proposed branch: lp:~gophers/goose/unstable-001
Merge into: lp:~gophers/goose/trunk
Diff against target: 374 lines (+52/-43) (has conflicts)
25 files modified
client/client.go (+3/-3)
client/client_test.go (+1/-1)
client/live_test.go (+2/-2)
client/local_test.go (+3/-3)
glance/glance.go (+2/-2)
glance/glance_test.go (+3/-3)
http/client.go (+1/-1)
identity/identity_test.go (+1/-1)
identity/legacy_test.go (+2/-2)
identity/userpass.go (+1/-1)
identity/userpass_test.go (+2/-2)
nova/nova.go (+2/-2)
nova/nova_test.go (+3/-3)
swift/live_test.go (+4/-4)
swift/local_test.go (+4/-4)
swift/swift.go (+2/-2)
swift/swift_test.go (+1/-1)
testservices/identityservice/legacy_test.go (+1/-1)
testservices/identityservice/service_test.go (+1/-1)
testservices/identityservice/userpass_test.go (+1/-1)
testservices/main.go (+1/-1)
testservices/novaservice/service.go (+1/-1)
testservices/novaservice/service_http_test.go (+4/-0)
testservices/novaservice/service_test.go (+5/-0)
testservices/swiftservice/service_http_test.go (+1/-1)
Text conflict in testservices/novaservice/service_http_test.go
Text conflict in testservices/novaservice/service_test.go
To merge this branch: bzr merge lp:~gophers/goose/unstable-001
Reviewer Review Type Date Requested Status
The Go Language Gophers Pending
Review via email: mp+140140@code.launchpad.net

Description of the change

This is the change that would give us a unique API-stable URL.

To post a comment you must log in.

Unmerged revisions

39. By John A Meinel

Rename all the imports to the 'current' branch number.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/client.go'
2--- client/client.go 2012-11-30 10:24:37 +0000
3+++ client/client.go 2012-12-17 07:30:26 +0000
4@@ -3,9 +3,9 @@
5 import (
6 "errors"
7 "fmt"
8- gooseerrors "launchpad.net/goose/errors"
9- goosehttp "launchpad.net/goose/http"
10- "launchpad.net/goose/identity"
11+ gooseerrors "launchpad.net/~gophers/goose/unstable-001/errors"
12+ goosehttp "launchpad.net/~gophers/goose/unstable-001/http"
13+ "launchpad.net/~gophers/goose/unstable-001/identity"
14 "net/http"
15 )
16
17
18=== modified file 'client/client_test.go'
19--- client/client_test.go 2012-11-30 00:41:44 +0000
20+++ client/client_test.go 2012-12-17 07:30:26 +0000
21@@ -3,7 +3,7 @@
22 import (
23 "flag"
24 . "launchpad.net/gocheck"
25- "launchpad.net/goose/identity"
26+ "launchpad.net/~gophers/goose/unstable-001/identity"
27 "testing"
28 )
29
30
31=== modified file 'client/live_test.go'
32--- client/live_test.go 2012-11-28 05:14:17 +0000
33+++ client/live_test.go 2012-12-17 07:30:26 +0000
34@@ -2,8 +2,8 @@
35
36 import (
37 . "launchpad.net/gocheck"
38- "launchpad.net/goose/client"
39- "launchpad.net/goose/identity"
40+ "launchpad.net/~gophers/goose/unstable-001/client"
41+ "launchpad.net/~gophers/goose/unstable-001/identity"
42 )
43
44 func registerOpenStackTests(cred *identity.Credentials, authMethods []identity.AuthMethod) {
45
46=== modified file 'client/local_test.go'
47--- client/local_test.go 2012-11-30 00:41:44 +0000
48+++ client/local_test.go 2012-12-17 07:30:26 +0000
49@@ -2,9 +2,9 @@
50
51 import (
52 . "launchpad.net/gocheck"
53- "launchpad.net/goose/identity"
54- "launchpad.net/goose/testing/httpsuite"
55- "launchpad.net/goose/testservices/identityservice"
56+ "launchpad.net/~gophers/goose/unstable-001/identity"
57+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
58+ "launchpad.net/~gophers/goose/unstable-001/testservices/identityservice"
59 "net/http"
60 )
61
62
63=== modified file 'glance/glance.go'
64--- glance/glance.go 2012-12-04 01:13:46 +0000
65+++ glance/glance.go 2012-12-17 07:30:26 +0000
66@@ -4,8 +4,8 @@
67
68 import (
69 "fmt"
70- "launchpad.net/goose/client"
71- goosehttp "launchpad.net/goose/http"
72+ "launchpad.net/~gophers/goose/unstable-001/client"
73+ goosehttp "launchpad.net/~gophers/goose/unstable-001/http"
74 "net/http"
75 )
76
77
78=== modified file 'glance/glance_test.go'
79--- glance/glance_test.go 2012-12-04 01:13:46 +0000
80+++ glance/glance_test.go 2012-12-17 07:30:26 +0000
81@@ -3,9 +3,9 @@
82 import (
83 "flag"
84 . "launchpad.net/gocheck"
85- "launchpad.net/goose/client"
86- "launchpad.net/goose/glance"
87- "launchpad.net/goose/identity"
88+ "launchpad.net/~gophers/goose/unstable-001/client"
89+ "launchpad.net/~gophers/goose/unstable-001/glance"
90+ "launchpad.net/~gophers/goose/unstable-001/identity"
91 "testing"
92 )
93
94
95=== modified file 'http/client.go'
96--- http/client.go 2012-12-04 07:35:49 +0000
97+++ http/client.go 2012-12-17 07:30:26 +0000
98@@ -8,7 +8,7 @@
99 "errors"
100 "fmt"
101 "io/ioutil"
102- gooseerrors "launchpad.net/goose/errors"
103+ gooseerrors "launchpad.net/~gophers/goose/unstable-001/errors"
104 "net/http"
105 "net/url"
106 "strings"
107
108=== modified file 'identity/identity_test.go'
109--- identity/identity_test.go 2012-11-30 02:06:06 +0000
110+++ identity/identity_test.go 2012-12-17 07:30:26 +0000
111@@ -2,7 +2,7 @@
112
113 import (
114 . "launchpad.net/gocheck"
115- "launchpad.net/goose/testing/envsuite"
116+ "launchpad.net/~gophers/goose/unstable-001/testing/envsuite"
117 "os"
118 )
119
120
121=== modified file 'identity/legacy_test.go'
122--- identity/legacy_test.go 2012-11-21 12:13:59 +0000
123+++ identity/legacy_test.go 2012-12-17 07:30:26 +0000
124@@ -2,8 +2,8 @@
125
126 import (
127 . "launchpad.net/gocheck"
128- "launchpad.net/goose/testing/httpsuite"
129- "launchpad.net/goose/testservices/identityservice"
130+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
131+ "launchpad.net/~gophers/goose/unstable-001/testservices/identityservice"
132 )
133
134 type LegacyTestSuite struct {
135
136=== modified file 'identity/userpass.go'
137--- identity/userpass.go 2012-11-22 07:20:25 +0000
138+++ identity/userpass.go 2012-12-17 07:30:26 +0000
139@@ -2,7 +2,7 @@
140
141 import (
142 "fmt"
143- goosehttp "launchpad.net/goose/http"
144+ goosehttp "launchpad.net/~gophers/goose/unstable-001/http"
145 "net/http"
146 )
147
148
149=== modified file 'identity/userpass_test.go'
150--- identity/userpass_test.go 2012-11-21 12:13:59 +0000
151+++ identity/userpass_test.go 2012-12-17 07:30:26 +0000
152@@ -2,8 +2,8 @@
153
154 import (
155 . "launchpad.net/gocheck"
156- "launchpad.net/goose/testing/httpsuite"
157- "launchpad.net/goose/testservices/identityservice"
158+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
159+ "launchpad.net/~gophers/goose/unstable-001/testservices/identityservice"
160 )
161
162 type UserPassTestSuite struct {
163
164=== modified file 'nova/nova.go'
165--- nova/nova.go 2012-12-10 14:13:22 +0000
166+++ nova/nova.go 2012-12-17 07:30:26 +0000
167@@ -5,8 +5,8 @@
168 import (
169 "encoding/base64"
170 "fmt"
171- "launchpad.net/goose/client"
172- goosehttp "launchpad.net/goose/http"
173+ "launchpad.net/~gophers/goose/unstable-001/client"
174+ goosehttp "launchpad.net/~gophers/goose/unstable-001/http"
175 "net/http"
176 "net/url"
177 )
178
179=== modified file 'nova/nova_test.go'
180--- nova/nova_test.go 2012-12-10 14:13:22 +0000
181+++ nova/nova_test.go 2012-12-17 07:30:26 +0000
182@@ -3,9 +3,9 @@
183 import (
184 "flag"
185 . "launchpad.net/gocheck"
186- "launchpad.net/goose/client"
187- "launchpad.net/goose/identity"
188- "launchpad.net/goose/nova"
189+ "launchpad.net/~gophers/goose/unstable-001/client"
190+ "launchpad.net/~gophers/goose/unstable-001/identity"
191+ "launchpad.net/~gophers/goose/unstable-001/nova"
192 "testing"
193 "time"
194 )
195
196=== modified file 'swift/live_test.go'
197--- swift/live_test.go 2012-11-30 10:24:37 +0000
198+++ swift/live_test.go 2012-12-17 07:30:26 +0000
199@@ -2,10 +2,10 @@
200
201 import (
202 . "launchpad.net/gocheck"
203- "launchpad.net/goose/client"
204- gooseerrors "launchpad.net/goose/errors"
205- "launchpad.net/goose/identity"
206- "launchpad.net/goose/swift"
207+ "launchpad.net/~gophers/goose/unstable-001/client"
208+ gooseerrors "launchpad.net/~gophers/goose/unstable-001/errors"
209+ "launchpad.net/~gophers/goose/unstable-001/identity"
210+ "launchpad.net/~gophers/goose/unstable-001/swift"
211 )
212
213 func registerOpenStackTests(cred *identity.Credentials) {
214
215=== modified file 'swift/local_test.go'
216--- swift/local_test.go 2012-11-30 00:41:44 +0000
217+++ swift/local_test.go 2012-12-17 07:30:26 +0000
218@@ -2,10 +2,10 @@
219
220 import (
221 . "launchpad.net/gocheck"
222- "launchpad.net/goose/identity"
223- "launchpad.net/goose/testing/httpsuite"
224- "launchpad.net/goose/testservices/identityservice"
225- "launchpad.net/goose/testservices/swiftservice"
226+ "launchpad.net/~gophers/goose/unstable-001/identity"
227+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
228+ "launchpad.net/~gophers/goose/unstable-001/testservices/identityservice"
229+ "launchpad.net/~gophers/goose/unstable-001/testservices/swiftservice"
230 "net/http"
231 )
232
233
234=== modified file 'swift/swift.go'
235--- swift/swift.go 2012-11-29 02:33:31 +0000
236+++ swift/swift.go 2012-12-17 07:30:26 +0000
237@@ -4,8 +4,8 @@
238
239 import (
240 "fmt"
241- "launchpad.net/goose/client"
242- goosehttp "launchpad.net/goose/http"
243+ "launchpad.net/~gophers/goose/unstable-001/client"
244+ goosehttp "launchpad.net/~gophers/goose/unstable-001/http"
245 "net/http"
246 )
247
248
249=== modified file 'swift/swift_test.go'
250--- swift/swift_test.go 2012-11-30 00:41:44 +0000
251+++ swift/swift_test.go 2012-12-17 07:30:26 +0000
252@@ -3,7 +3,7 @@
253 import (
254 "flag"
255 . "launchpad.net/gocheck"
256- "launchpad.net/goose/identity"
257+ "launchpad.net/~gophers/goose/unstable-001/identity"
258 "testing"
259 )
260
261
262=== modified file 'testservices/identityservice/legacy_test.go'
263--- testservices/identityservice/legacy_test.go 2012-11-11 11:13:52 +0000
264+++ testservices/identityservice/legacy_test.go 2012-12-17 07:30:26 +0000
265@@ -3,7 +3,7 @@
266 import (
267 "io/ioutil"
268 . "launchpad.net/gocheck"
269- "launchpad.net/goose/testing/httpsuite"
270+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
271 "net/http"
272 )
273
274
275=== modified file 'testservices/identityservice/service_test.go'
276--- testservices/identityservice/service_test.go 2012-11-11 15:29:52 +0000
277+++ testservices/identityservice/service_test.go 2012-12-17 07:30:26 +0000
278@@ -2,7 +2,7 @@
279
280 import (
281 . "launchpad.net/gocheck"
282- "launchpad.net/goose/testing/httpsuite"
283+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
284 )
285
286 // All tests in the IdentityServiceSuite run against each IdentityService
287
288=== modified file 'testservices/identityservice/userpass_test.go'
289--- testservices/identityservice/userpass_test.go 2012-11-16 16:39:16 +0000
290+++ testservices/identityservice/userpass_test.go 2012-12-17 07:30:26 +0000
291@@ -5,7 +5,7 @@
292 "fmt"
293 "io/ioutil"
294 . "launchpad.net/gocheck"
295- "launchpad.net/goose/testing/httpsuite"
296+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
297 "net/http"
298 "strings"
299 )
300
301=== modified file 'testservices/main.go'
302--- testservices/main.go 2012-11-11 11:13:52 +0000
303+++ testservices/main.go 2012-12-17 07:30:26 +0000
304@@ -3,7 +3,7 @@
305 import (
306 "fmt"
307 "launchpad.net/gnuflag"
308- "launchpad.net/goose/testservices/identityservice"
309+ "launchpad.net/~gophers/goose/unstable-001/testservices/identityservice"
310 "log"
311 "net/http"
312 "strings"
313
314=== modified file 'testservices/novaservice/service.go'
315--- testservices/novaservice/service.go 2012-12-12 17:30:27 +0000
316+++ testservices/novaservice/service.go 2012-12-17 07:30:26 +0000
317@@ -4,7 +4,7 @@
318
319 import (
320 "fmt"
321- "launchpad.net/goose/nova"
322+ "launchpad.net/~gophers/goose/unstable-001/nova"
323 "strings"
324 )
325
326
327=== modified file 'testservices/novaservice/service_http_test.go'
328--- testservices/novaservice/service_http_test.go 2012-12-12 17:30:27 +0000
329+++ testservices/novaservice/service_http_test.go 2012-12-17 07:30:26 +0000
330@@ -7,11 +7,15 @@
331 "encoding/json"
332 "io/ioutil"
333 . "launchpad.net/gocheck"
334+<<<<<<< TREE
335 "launchpad.net/goose/nova"
336 "launchpad.net/goose/testing/httpsuite"
337 "net/http"
338 "strconv"
339 "strings"
340+=======
341+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
342+>>>>>>> MERGE-SOURCE
343 )
344
345 type NovaHTTPSuite struct {
346
347=== modified file 'testservices/novaservice/service_test.go'
348--- testservices/novaservice/service_test.go 2012-12-12 17:30:27 +0000
349+++ testservices/novaservice/service_test.go 2012-12-17 07:30:26 +0000
350@@ -5,7 +5,12 @@
351 import (
352 "fmt"
353 . "launchpad.net/gocheck"
354+<<<<<<< TREE
355 "launchpad.net/goose/nova"
356+=======
357+ "launchpad.net/~gophers/goose/unstable-001/nova"
358+ "strings"
359+>>>>>>> MERGE-SOURCE
360 )
361
362 type NovaSuite struct {
363
364=== modified file 'testservices/swiftservice/service_http_test.go'
365--- testservices/swiftservice/service_http_test.go 2012-11-29 08:49:55 +0000
366+++ testservices/swiftservice/service_http_test.go 2012-12-17 07:30:26 +0000
367@@ -6,7 +6,7 @@
368 "bytes"
369 "io/ioutil"
370 . "launchpad.net/gocheck"
371- "launchpad.net/goose/testing/httpsuite"
372+ "launchpad.net/~gophers/goose/unstable-001/testing/httpsuite"
373 "net/http"
374 )
375

Subscribers

People subscribed via source and target branches