Merge branch 'devel-2.7'
authorMichael Hanselmann <hansmi@google.com>
Tue, 5 Feb 2013 16:51:52 +0000 (17:51 +0100)
committerMichael Hanselmann <hansmi@google.com>
Tue, 5 Feb 2013 16:55:07 +0000 (17:55 +0100)
* 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

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>

1  2 
Makefile.am
lib/constants.py
lib/hypervisor/hv_kvm.py
qa/ganeti-qa.py
qa/qa_utils.py

diff --cc Makefile.am
Simple merge
Simple merge
Simple merge
diff --cc qa/ganeti-qa.py
Simple merge
diff --cc qa/qa_utils.py
Simple merge