Merge c5b3ca1 into 1c8600c

jpvanhal · Dec 10, 2015 · e5f6347 · e5f6347
2 parents 1c8600c + c5b3ca1
commit e5f6347
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/siilo/storages/amazon_s3.py b/siilo/storages/amazon_s3.py
@@ -72,6 +72,8 @@ class AmazonS3Storage(ApacheLibcloudStorage):
         +--------------------+-------------------------------+
         | ``ap-northeast-1`` | Asia Pacific (Tokyo)          |
         +--------------------+-------------------------------+
+        | ``sa-east-1``      | South America (Sao Paulo)     |
+        +--------------------+-------------------------------+
 
         Defaults to ``us-east-1``.
 
@@ -112,6 +114,7 @@ class AmazonS3Storage(ApacheLibcloudStorage):
         'us-east-1': 'S3',
         'us-west-1': 'S3_US_WEST',
         'us-west-2': 'S3_US_WEST_OREGON',
+        'sa-east-1': 'S3_SA_EAST',
     }
 
     def __init__(self, access_key_id, secret_access_key, bucket,