Merge remote branch 'cros/upstream' into master

cli/job.py

Index: cli/job.py
diff --git a/cli/job.py b/cli/job.py
index 660dfe530762565e12c009da5c95a80030369743..c90959163998cd2ab36fddb863a030e1c387cc00 100644
--- a/cli/job.py
+++ b/cli/job.py
@@ -609,6 +609,12 @@ class job_clone(job_create_or_clone):
         for field in ('name', 'created_on', 'id', 'owner'):
             del clone_info['job'][field]
 
+        # Also remove parameterized_job field, as the feature still is
+        # incomplete, this tool does not attempt to support it for now,
+        # it uses a different API function and it breaks create_job()

[DaleCurtis, 2011/02/03 18:07:32]

Will this effect Paul's changes?

[ericli, 2011/02/03 19:18:35]

my understanding this will only affect atest job clone, which we are not using
and its not tested ever.

On 2011/02/03 18:07:32, dalec wrote:

+        if clone_info['job'].has_key('parameterized_job'):
+            del clone_info['job']['parameterized_job']
+
         # Keyword args cannot be unicode strings
         self.data.update((str(key), val)
                          for key, val in clone_info['job'].iteritems())