summaryrefslogtreecommitdiff
path: root/vswitchd/vswitch.xml
diff options
context:
space:
mode:
authorAndrew Evans <aevans@nicira.com>2011-02-10 16:50:49 -0800
committerAndrew Evans <aevans@nicira.com>2011-02-11 13:03:06 -0800
commit404c169247b1c3ac2ebad887f0421478a6cef924 (patch)
tree30779cedfa883ff745b136e3249d9149fde37f49 /vswitchd/vswitch.xml
parentf48f70b7a329460d2474cd4e079cc7912ea0a187 (diff)
downloadopenvswitch-404c169247b1c3ac2ebad887f0421478a6cef924.tar.gz
xenserver: Merge upstream changes and drop pre-5.6.100 support.
Citrix have made modifications to the various interface configuration scripts that OVS replaces, so at present those modifications are lost when OVS is installed on e.g. XenServer 5.6.100. This commit applies those changes while preserving OVS-specific modifications that have been made in the interim. One major change introduced by these updates is the removal of support for XenServer releases prior to 5.6.100. This commit also updates the OVS-supplied xen-bugtool in similar fashion. We will soon remove xen-bugtool from OVS altogether and move the added OVS functionality to an XML extension as described in the Supplemental Pack DDK guide.
Diffstat (limited to 'vswitchd/vswitch.xml')
-rw-r--r--vswitchd/vswitch.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index f4515f4fe..c80e8cdb5 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -244,7 +244,7 @@
<column name="system_version">
<p>
The version of the system identified by <ref column="system_type"/>,
- e.g. <code>5.5.0-24648p</code> on XenServer 5.5.0 build 24648.
+ e.g. <code>5.6.100-39265p</code> on XenServer 5.6.100 build 39265.
</p>
<p>
System integrators are responsible for choosing and setting an