commit 45e5883 (HEAD, master)
Merge: 0c6d6a5 93146c8
Author: Michael Hanselmann <[email protected]>
Date: Tue Feb 5 17:51:52 2013 +0100
Merge branch 'devel-2.7'
* devel-2.7:
Redirect output for gnt-* list/list-fields commands
Add function to execute QA commands with redirected output
Implement option to skip logging of QA commands
Fix typo in a comment
Add some more Haskell/Python equivalence tests
Fix Haskell log file naming after virtual cluster changes
QA: Clean up after "instance-remove-drbd-offline" test
Switch KVM to multi-error verify results
Make LXC fail verification if cgroup is not mounted
Add a helper function for hypervisor verification
hv_lxc: fix whitespace errors
s/nic/NIC/ in manpages
LXC: add support for the memory controller
LXC: adapt hv for newer lxc userspace tools