fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2079 from dmcgowan/update-swift-vendor

Browse Source 
Update swift vendor for upstreamed change
This commit is contained in:
Derek McGowan 2016-11-23 13:19:53 -08:00 committed by GitHub
commit 8f9abbd27f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -223,11 +223,11 @@
}, },
{ {
"ImportPath": "github.com/ncw/swift", "ImportPath": "github.com/ncw/swift",
"Rev": "ce444d6d47c51d4dda9202cd38f5094dd8e27e86" "Rev": "b964f2ca856aac39885e258ad25aec08d5f64ee6"
}, },
{ {
"ImportPath": "github.com/ncw/swift/swifttest", "ImportPath": "github.com/ncw/swift/swifttest",
"Rev": "ce444d6d47c51d4dda9202cd38f5094dd8e27e86" "Rev": "b964f2ca856aac39885e258ad25aec08d5f64ee6"
}, },
{ {
"ImportPath": "github.com/spf13/cobra", "ImportPath": "github.com/spf13/cobra",

1
vendor/github.com/ncw/swift/README.md generated vendored
View File

@ -137,3 +137,4 @@ Contributors
- Stefan Majewsky <stefan.majewsky@sap.com> - Stefan Majewsky <stefan.majewsky@sap.com>
- Cezar Sa Espinola <cezarsa@gmail.com> - Cezar Sa Espinola <cezarsa@gmail.com>
- Sam Gunaratne <samgzeit@gmail.com> - Sam Gunaratne <samgzeit@gmail.com>
- Richard Scothern <richard.scothern@gmail.com>

6
vendor/github.com/ncw/swift/swift.go generated vendored
View File

@ -1746,15 +1746,15 @@ func (c *Connection) Object(container string, objectName string) (info Object, h
return return
} }
} }
//HACK // Currently ceph doesn't return a Last-Modified header for DLO manifests without any segments
//Currently ceph doestn't return Last-Modified header for DLO manifest without any segments // See ceph http://tracker.ceph.com/issues/15812
//Currently it affects all versions of ceph http://tracker.ceph.com/issues/15812
if resp.Header.Get("Last-Modified") != "" { if resp.Header.Get("Last-Modified") != "" {
info.ServerLastModified = resp.Header.Get("Last-Modified") info.ServerLastModified = resp.Header.Get("Last-Modified")
if info.LastModified, err = time.Parse(http.TimeFormat, info.ServerLastModified); err != nil { if info.LastModified, err = time.Parse(http.TimeFormat, info.ServerLastModified); err != nil {
return return
} }
} }
info.Hash = resp.Header.Get("Etag") info.Hash = resp.Header.Get("Etag")
return return
} }