diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-06-14 11:34:33 -0700 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-06-14 11:34:33 -0700 |
| commit | 64f7ebff56a1e54b862f53bd0a32c6600c4cc411 (patch) | |
| tree | ed7140a8e4233a8f37b96e349cd17cfd14140180 /nova/virt | |
| parent | 7a2712ebf74e5565663a6723a992151f71255eff (diff) | |
| parent | 812fe496e2bae701ee7d90d289ff1062c631e14f (diff) | |
Merge trunk
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index b9d4346e4..11da221f2 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -157,7 +157,6 @@ class VMHelper(HelperBase): rec['PV_ramdisk'] = ramdisk else: # 2. Use kernel within the image - rec['PV_args'] = 'clocksource=jiffies' rec['PV_bootloader'] = 'pygrub' else: # 3. Using hardware virtualization |