Update swift vendor for upstreamed change
Gets rid of deviation between hash and upstream. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)master
							parent
							
								
									7694c31658
								
							
						
					
					
						commit
						e9684b126e
					
				|  | @ -223,11 +223,11 @@ | |||
| 		}, | ||||
| 		{ | ||||
| 			"ImportPath": "github.com/ncw/swift", | ||||
| 			"Rev": "ce444d6d47c51d4dda9202cd38f5094dd8e27e86" | ||||
| 			"Rev": "b964f2ca856aac39885e258ad25aec08d5f64ee6" | ||||
| 		}, | ||||
| 		{ | ||||
| 			"ImportPath": "github.com/ncw/swift/swifttest", | ||||
| 			"Rev": "ce444d6d47c51d4dda9202cd38f5094dd8e27e86" | ||||
| 			"Rev": "b964f2ca856aac39885e258ad25aec08d5f64ee6" | ||||
| 		}, | ||||
| 		{ | ||||
| 			"ImportPath": "github.com/spf13/cobra", | ||||
|  |  | |||
|  | @ -137,3 +137,4 @@ Contributors | |||
| - Stefan Majewsky <stefan.majewsky@sap.com> | ||||
| - Cezar Sa Espinola <cezarsa@gmail.com> | ||||
| - Sam Gunaratne <samgzeit@gmail.com> | ||||
| - Richard Scothern <richard.scothern@gmail.com> | ||||
|  |  | |||
|  | @ -1746,15 +1746,15 @@ func (c *Connection) Object(container string, objectName string) (info Object, h | |||
| 			return | ||||
| 		} | ||||
| 	} | ||||
| 	//HACK
 | ||||
| 	//Currently ceph doestn't return Last-Modified header for DLO manifest without any segments
 | ||||
| 	//Currently it affects all versions of ceph http://tracker.ceph.com/issues/15812
 | ||||
| 	// Currently ceph doesn't return a Last-Modified header for DLO manifests without any segments
 | ||||
| 	// See ceph http://tracker.ceph.com/issues/15812
 | ||||
| 	if resp.Header.Get("Last-Modified") != "" { | ||||
| 		info.ServerLastModified = resp.Header.Get("Last-Modified") | ||||
| 		if info.LastModified, err = time.Parse(http.TimeFormat, info.ServerLastModified); err != nil { | ||||
| 			return | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	info.Hash = resp.Header.Get("Etag") | ||||
| 	return | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue