synchronzing vmdev with prod because copypasta.
authorBryan <btbonval@gmail.com>
Fri, 17 Jan 2014 00:39:32 +0000 (19:39 -0500)
committerBryan <btbonval@gmail.com>
Fri, 17 Jan 2014 00:39:32 +0000 (19:39 -0500)
karmaworld/settings/vmdev.py

index b02e1f61e5492aeb953caddea2178f04276989bb..ed7c1693446b5bae34b9170793e4675ea3043e01 100644 (file)
@@ -11,12 +11,7 @@ from S3 import CallingFormat
 from common import *
 
 
-from karmaworld.secret.static_s3 import DEFAULT_FILE_STORAGE
-from karmaworld.secret.static_s3 import AWS_ACCESS_KEY_ID
-from karmaworld.secret.static_s3 import AWS_SECRET_ACCESS_KEY
-from karmaworld.secret.static_s3 import AWS_STORAGE_BUCKET_NAME
-from karmaworld.secret.static_s3 import S3_URL
-from karmaworld.secret.static_s3 import STATIC_URL
+from karmaworld.secret.static_s3 import *
 
 from karmaworld.secret.db_settings import PROD_DB_NAME
 from karmaworld.secret.db_settings import PROD_DB_USERNAME