CP-4148:Ensure that the default behaviour for emulated monitor is null
Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
Revert "CA-108916: add call to V6rpc.get_current_edition API"

This reverts commit 04f4d921c9d657f928fb4768abc390095b1418cc.
CA-113278: This commit was causing many testcases to fail. Reverting the commit for now till we figure out a better way to fix the original problem.

Signed-off-by: Akshay <akshay.ramani@citrix.com>
CA-99034: Fix unit for DS:memory_internal_free.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
CA-114777: Revert "Fix XenAPI.py on python2.7"

Unfortunately python2.4 doesn't work with this fix.

This reverts commit 7cd259574198123e9152db4a483bae54eed15c95.

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1473 from johnelse/ca-114777

Revert "Fix XenAPI.py on python2.7"
CA-110947: Revert "Remove a modprobe warning in new systems."

This breaks switching to the bridge networking backend - this change
means /etc/modprobe.d/blacklist-bridge is not deleted when switching
to bridge, so after the host reboots it can't load the ethernet
bridging kernel module and networking is totally broken.

This reverts commit 37eee6eff0ce3fb4a0185e6f4aa03094c0668844.

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1472 from johnelse/ca-110947

Revert "Remove a modprobe warning in new systems."
Merge pull request #1458 from akshayramani/CA-113278

Revert "CA-108916: add call to V6rpc.get_current_edition API"
Merge pull request #1465 from siddharthv/CA-99034

Fix unit for DS:memory_internal_free.
Merge pull request #1450 from akshayramani/CP-4148

CP-4148:Ensure that the default behaviour for emulated monitor is null