Merge remote-tracking branch 'upstream/v0.2.0' into update-identity-v2
Conflicts:
openstack/common/extensions/requests.go
openstack/identity/v3/tokens/results.go
openstack/networking/v2/extensions/delegate_test.go
diff --git a/openstack/common/extensions/requests.go b/openstack/common/extensions/requests.go
old mode 100644
new mode 100755
index ed5ea4b..000151b
--- a/openstack/common/extensions/requests.go
+++ b/openstack/common/extensions/requests.go
@@ -9,12 +9,11 @@
// Get retrieves information for a specific extension using its alias.
func Get(c *gophercloud.ServiceClient, alias string) GetResult {
var res GetResult
- _, err := perigee.Request("GET", ExtensionURL(c, alias), perigee.Options{
+ _, res.Err = perigee.Request("GET", ExtensionURL(c, alias), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
Results: &res.Resp,
OkCodes: []int{200},
})
- res.Err = err
return res
}