Merge pull request #3 from paulwakeford/master

Updated Amazon Linux AMI versions. Removed white space from cron.yaml
jros2300 · Nov 17, 2015 · 7f1cd8e · 7f1cd8e
2 parents 55443ba + f42b789
commit 7f1cd8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/cron.yaml b/cron.yaml
@@ -1,8 +1,8 @@
 version: 1
 cron:
-  - name: "apply-recommendations-job"          
-    url: "/periodicworker"              
-    schedule: "*/5 * * * *"    
-  - name: "read-s3-dbr"          
-    url: "/s3importer"              
-    schedule: "* */2 * * *"    
+  - name: "apply-recommendations-job"
+    url: "/periodicworker"
+    schedule: "*/5 * * * *"
+  - name: "read-s3-dbr"
+    url: "/s3importer"
+    schedule: "* */2 * * *"
diff --git a/reservedinstances.cform b/reservedinstances.cform
@@ -183,7 +183,7 @@
                     "Ref": "RIApplication"
                 },
                 "Description": "Reserved Instances Tool Application Web Server",
-                "SolutionStackName": "64bit Amazon Linux 2015.03 v1.4.1 running Ruby 2.2 (Passenger Standalone)",
+                "SolutionStackName": "64bit Amazon Linux 2015.09 v2.0.4 running Ruby 2.2 (Passenger Standalone)",
                 "VersionLabel": {
                     "Ref": "RIApplicationVersion"
                 },
@@ -331,7 +331,7 @@
                     "Ref": "RIApplication"
                 },
                 "Description": "Reserved Instances Tool Worker to apply the recommendations automatically",
-                "SolutionStackName": "64bit Amazon Linux 2015.03 v1.4.1 running Ruby 2.2 (Passenger Standalone)",
+                "SolutionStackName": "64bit Amazon Linux 2015.09 v2.0.4 running Ruby 2.2 (Passenger Standalone)",
                 "VersionLabel": {
                     "Ref": "RIApplicationVersion"
                 },