]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
Merge branch 'colo.2015-03-31' of xenbits.xen.org:/home/iwj/ext/osstest into queue
authorIan Campbell <ian.campbell@citrix.com>
Tue, 31 Mar 2015 14:49:15 +0000 (15:49 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 31 Mar 2015 14:49:15 +0000 (15:49 +0100)
1  2 
Osstest.pm
sg-run-job

diff --cc Osstest.pm
Simple merge
diff --cc sg-run-job
Simple merge