Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

Browse source 
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
This commit is contained in:
drigato 2015-01-06 15:46:20 -05:00
commit 08738cf391
4 changed files with 130 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/cloud_storage/Amazon_S3.php
View file

@ -18,6 +18,7 @@ class Amazon_S3 extends StorageBackend
$this->s3Client = S3Client::factory(array(
'key' => $securityCredentials['api_key'],
'secret' => $securityCredentials['api_key_secret'],
'region' => $securityCredentials['region']
));
}