]> xenbits.xensource.com Git - xenrt-citrix/xenrt.git/commit
Merge branch 'master' into VDIScalability
authorAkash Chandrashekar <akash.chandrashekar@citrix.com>
Wed, 18 Nov 2015 12:11:03 +0000 (17:41 +0530)
committerAkash Chandrashekar <akash.chandrashekar@citrix.com>
Wed, 18 Nov 2015 12:11:03 +0000 (17:41 +0530)
commit945ae77323d7650c39e1efb8d30693c11f703d4d
tree8630e51a268e9d54ec8d412a1dbb119cbbb86693
parentb387d6b59df43ef805af4208fc98428a1b68243e
parentde15ada452cab243b46e96eae01d96d1a4a4d2f1
Merge branch 'master' into VDIScalability

Conflicts:
exec/xenrt/config.py
exec/xenrt/config.py
exec/xenrt/lib/xenserver/guest.py