On Tue, Feb 22, 2011 at 04:46:07PM +0100, Michael Hanselmann wrote: > commit 79815d4e2af35f200e7ce3888d61430e5559128f > Merge: a1e4337 e41a1c0 > Author: Michael Hanselmann <[email protected]> > Date: Tue Feb 22 16:36:44 2011 +0100 > > Merge branch 'devel-2.4' > > * devel-2.4: (60 commits) > Update news and bump version for 2.4.0 rc2 > Fix pylint warnings > TestRapiInstanceRename use instance name > Change the list formatting to a 'special' chars > Add support for merging node groups > Add option to rename groups on conflict > Fix minor docstring typo > Add QA rapi test for instance reinstall > RAPI: remove required parameters for reinstall > Fix HV/OS parameter validation on non-vm nodes > NodeQuery: mark live fields as UNAVAIL for non-vm_capable nodes > NodeQuery: don't query non-vm_capable nodes > Fix LUClusterRepairDiskSizes and rpc result usage > Fix RPC mismatch in blockdev_getsize[s] > Remove superfluous redundant requirement > Don't remove master_candidate flag from merged nodes > Use a consistent ECID base > listrunner: convert from getopt to optparse > listrunner: fix agent usage > Revert "Disable the cluster-merge tool for the moment" > ... > > Conflicts: > NEWS: Trivial > lib/cli.py: Dropped _RSTATUS_TO_TEXT from master and used > RSS_DESCRIPTION from devel-2.4 instead, adjusted users accordingly
LGTM.
