On 14 May 2013 15:52, Thomas Thrainer <[email protected]> wrote: > - > - > -def _ComputeAncillaryFiles(cluster, redist): > - """Compute files external to Ganeti which need to be consistent. > + Check that at most one of (iallocator, node) is specified. If none is > + specified, or the iallocator is L{constants.DEFAULT_IALLOCATOR_SHORTCUT}, > + then the LU's opcode's iallocator slot is filled with the cluster-wide > + default iallocator. > > - @type redist: boolean > - @param redist: Whether to include files which need to be redistributed > + @type iallocator_slot: string > + @param iallocator_slot: the name of the opcode iallocator slot > + @type node_slot: string > + @param node_slot: the name of the opcode target node slot
It seems that diff gets confused here. Please try the "--minimal" option of git-format-patch when you resubmit the series. It's easier to read, thanks. Bernardo
