Merge in master.

2017-03-05 09:58:39 -05:00 · 2017-03-05 09:58:39 -05:00 · 3b4ef2cf15
commit 3b4ef2cf15
parent d530bcf4a7 0393c384ad
26 changed files with 565 additions and 65 deletions
--- a/moto/s3/models.py
+++ b/moto/s3/models.py
@ -90,7 +90,7 @@ class FakeKey(object):
    @property
    def response_dict(self):
        res = {
-            'etag': self.etag,
+            'Etag': self.etag,
            'last-modified': self.last_modified_RFC1123,
            'content-length': str(len(self.value)),
        }