diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-01 04:11:35 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-01 04:11:35 +0300 |
| commit | 271e44ea57e157881cf855d0365d019f64568848 (patch) | |
| tree | a5b46838f67b40ee7a197fd1baa2cc9d4fedbd00 /config | |
| parent | d0e23197c77d4e7372587a624854f1ced3b87054 (diff) | |
| parent | 5adb25bb00dbc409f91749dc90713b06953b86e8 (diff) | |
Merge branch 'master' into log-refactoring-1
Conflicts:
core/Error.php
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 a8025027c0..1c5dc8dd39 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -55,7 +55,7 @@ aws_keyname = "" aws_pem_file = "<path to pem file>" aws_securitygroups[] = "default" aws_region = "us-east-1" -aws_ami = "ami-609c1e08" +aws_ami = "ami-ac24bac4" aws_instance_type = "c3.large" [log] |