archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	pillar/config.py.example
This commit is contained in:
Francesco Siddi
2016-03-15 10:21:04 +01:00
parent 1593e5c09d e73e8ccc31
commit 43453ff666
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pillar/config.py.example
View File

@@ -29,7 +29,6 @@ class Development(object):
'GOOGLE_APPLICATION_CREDENTIALS', '/data/config/google_app.json') 'GOOGLE_APPLICATION_CREDENTIALS', '/data/config/google_app.json')
GCLOUD_PROJECT = os.environ.get('GCLOUD_PROJECT', 'blender-cloud') GCLOUD_PROJECT = os.environ.get('GCLOUD_PROJECT', 'blender-cloud')
# Fill in only if we plan to sign our urls using a the CDN # Fill in only if we plan to sign our urls using a the CDN
CDN_USE_URL_SIGNING = False CDN_USE_URL_SIGNING = False
CDN_SERVICE_DOMAIN_PROTOCOL = 'https' CDN_SERVICE_DOMAIN_PROTOCOL = 'https'