diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-31 02:10:11 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-31 02:11:20 +0300 |
| commit | 1cd924d0371a2271798279b78e30585f4c7a80d9 (patch) | |
| tree | d459921c818bda0a3f23fc53b9fcb60f92be3ced /config | |
| parent | f5b6b4ccb021a3b082e578fc9a42c715985d1fae (diff) | |
| parent | bca9fdab124fb27aa0a7c04da768011fba26589f (diff) | |
Merge branch 'master' into php-di
Conflicts:
composer.json
composer.lock
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.ini.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 8413d9dc93..bc14fce1e4 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -48,7 +48,7 @@ aws_keyname = "" aws_pem_file = "<path to pem file>" aws_securitygroups[] = "default" aws_region = "us-east-1" -aws_ami = "ami-ce088ba6" +aws_ami = "ami-609c1e08" aws_instance_type = "c3.large" [log] |