projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74a4fc9) | patch
Fix error introduced during merge
authorMichele Tartara <mtartara@google.com>
Fri, 7 Mar 2014 17:26:44 +0000 (17:26 +0000)
committerMichele Tartara <mtartara@google.com>
Fri, 7 Mar 2014 17:32:52 +0000 (17:32 +0000)
commitddc6458281188cdb5307029f06b0a333b6606f2d
tree883c7dd63bacfcc2a9b9cb37db2d5dd4618e46fftree | snapshot
parent74a4fc947681e88493d19f31ca4adfcfffbf5481commit | diff
Fix error introduced during merge

A parameter was lost while resolving a conflict in the signature of a function.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
lib/hypervisor/hv_xen.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.