diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dbdd89149..8985d1ffd 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -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", diff --git a/vendor/github.com/ncw/swift/README.md b/vendor/github.com/ncw/swift/README.md index 3855a394e..2cc24cffa 100644 --- a/vendor/github.com/ncw/swift/README.md +++ b/vendor/github.com/ncw/swift/README.md @@ -137,3 +137,4 @@ Contributors - Stefan Majewsky - Cezar Sa Espinola - Sam Gunaratne +- Richard Scothern diff --git a/vendor/github.com/ncw/swift/swift.go b/vendor/github.com/ncw/swift/swift.go index 1337f10dc..4ba276b18 100644 --- a/vendor/github.com/ncw/swift/swift.go +++ b/vendor/github.com/ncw/swift/swift.go @@ -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 }