Merge branch 'master' into cache-control-objectStore

rackspace · May 25, 2016 · c8f234b · c8f234b
2 parents d1c7d25 + ff42b6a
commit c8f234b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/openstack/objectstorage/v1/accounts/requests.go b/openstack/objectstorage/v1/accounts/requests.go
@@ -25,7 +25,7 @@ func (opts GetOpts) ToAccountGetMap() (map[string]string, error) {
 // ExtractHeader method on the GetResult.
 func Get(c *gophercloud.ServiceClient, opts GetOptsBuilder) GetResult {
 	var res GetResult
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	if opts != nil {
 		headers, err := opts.ToAccountGetMap()

diff --git a/openstack/objectstorage/v1/containers/requests.go b/openstack/objectstorage/v1/containers/requests.go
@@ -96,7 +96,7 @@ func (opts CreateOpts) ToContainerCreateMap() (map[string]string, error) {
 // Create is a function that creates a new container.
 func Create(c *gophercloud.ServiceClient, containerName string, opts CreateOptsBuilder) CreateResult {
 	var res CreateResult
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	if opts != nil {
 		headers, err := opts.ToContainerCreateMap()
@@ -164,7 +164,7 @@ func (opts UpdateOpts) ToContainerUpdateMap() (map[string]string, error) {
 // metadata.
 func Update(c *gophercloud.ServiceClient, containerName string, opts UpdateOptsBuilder) UpdateResult {
 	var res UpdateResult
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	if opts != nil {
 		headers, err := opts.ToContainerUpdateMap()

diff --git a/openstack/objectstorage/v1/objects/requests.go b/openstack/objectstorage/v1/objects/requests.go
@@ -117,7 +117,7 @@ func Download(c *gophercloud.ServiceClient, containerName, objectName string, op
 	var res DownloadResult
 
 	url := downloadURL(c, containerName, objectName)
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	if opts != nil {
 		headers, query, err := opts.ToObjectDownloadParams()
@@ -283,7 +283,7 @@ func (opts CopyOpts) ToObjectCopyMap() (map[string]string, error) {
 // Copy is a function that copies one object to another.
 func Copy(c *gophercloud.ServiceClient, containerName, objectName string, opts CopyOptsBuilder) CopyResult {
 	var res CopyResult
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	headers, err := opts.ToObjectCopyMap()
 	if err != nil {
@@ -428,7 +428,7 @@ func (opts UpdateOpts) ToObjectUpdateMap() (map[string]string, error) {
 // Update is a function that creates, updates, or deletes an object's metadata.
 func Update(c *gophercloud.ServiceClient, containerName, objectName string, opts UpdateOptsBuilder) UpdateResult {
 	var res UpdateResult
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	if opts != nil {
 		headers, err := opts.ToObjectUpdateMap()

diff --git a/rackspace/objectstorage/v1/cdncontainers/requests.go b/rackspace/objectstorage/v1/cdncontainers/requests.go
@@ -35,7 +35,7 @@ func (opts EnableOpts) ToCDNContainerEnableMap() (map[string]string, error) {
 // Enable is a function that enables/disables a CDN container.
 func Enable(c *gophercloud.ServiceClient, containerName string, opts EnableOptsBuilder) EnableResult {
 	var res EnableResult
-	h := c.AuthenticatedHeaders()
+	h := make(map[string]string)
 
 	if opts != nil {
 		headers, err := opts.ToCDNContainerEnableMap()