Merge remote branch 'liraz/master'

turnkeylinux · Nov 19, 2012 · 55a3fdc · 55a3fdc
2 parents 0dd697f + c84f118
commit 55a3fdc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cloudtask/reporter.py b/cloudtask/reporter.py
@@ -101,7 +101,7 @@ def fmt_taskconf(taskconf):
         table = []
         for attr in ('split', 'command',
                      'ec2-region', 'ec2-size', 'ec2-type',
-                     'user', 'backup-id', 'workers',
+                     'user', 'backup-id', 'ami-id', 'workers',
                      'overlay', 'post', 'pre', 'timeout', 'report'):
 
             val = taskconf[attr.replace('-', '_')]

diff --git a/cloudtask/task.py b/cloudtask/task.py
@@ -121,7 +121,7 @@ def filter(job):
 
         for attr in ('split', 'command', 'hub-apikey', 
                      'ec2-region', 'ec2-size', 'ec2-type', 
-                     'user', 'backup-id', 'workers', 
+                     'user', 'backup-id', 'ami-id', 'workers', 
                      'overlay', 'post', 'pre', 'timeout', 'report'):
 
             val = taskconf[attr.replace('-', '_')]