]> xenbits.xensource.com Git - xenrt-citrix/xenrt.git/commitdiff
Merge remote-tracking branch 'origin/master' into improvempath
authorJohn Dilley <john.dilley@citrix.com>
Wed, 18 Nov 2015 12:33:17 +0000 (12:33 +0000)
committerJohn Dilley <john.dilley@citrix.com>
Wed, 18 Nov 2015 12:33:17 +0000 (12:33 +0000)
1  2 
exec/xenrt/config.py
exec/xenrt/lib/xenserver/host.py

Simple merge
Simple merge