Merge lp://staging/~gophers/goose/unstable-001 into lp://staging/~gophers/goose/trunk
Proposed by
John A Meinel
| Status: | Rejected |
|---|---|
| Rejected by: | John A Meinel |
| Proposed branch: | lp://staging/~gophers/goose/unstable-001 |
| Merge into: | lp://staging/~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://staging/~gophers/goose/unstable-001 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| The Go Language Gophers | Pending | ||
|
Review via email:
|
|||
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
