diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-02-05 15:58:27 -0800 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-02-05 17:14:55 -0800 |
| commit | a4af00400a835eb87569ba40e21874c05e872c0f (patch) | |
| tree | d9c6db715493bd6fc17c91e9552f8037c3ea7caa /xenserver/etc_init.d_vswitch-xapi-update | |
| parent | 93ff0290fda0f02904686989243089faaa9229e6 (diff) | |
| parent | 5819a7cdcf44f0277c538353672fb27701c764f9 (diff) | |
Merge branch 'master' into next
Conflicts:
COPYING
datapath/datapath.h
lib/automake.mk
lib/dpif-provider.h
lib/dpif.c
lib/hmap.h
lib/netdev-provider.h
lib/netdev.c
lib/stream-ssl.h
ofproto/executer.c
ofproto/ofproto.c
ofproto/ofproto.h
tests/automake.mk
utilities/ovs-ofctl.c
utilities/ovs-vsctl.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch
xenserver/etc_xensource_scripts_vif
xenserver/opt_xensource_libexec_interface-reconfigure
Diffstat (limited to 'xenserver/etc_init.d_vswitch-xapi-update')
| -rwxr-xr-x | xenserver/etc_init.d_vswitch-xapi-update | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xenserver/etc_init.d_vswitch-xapi-update b/xenserver/etc_init.d_vswitch-xapi-update index 667d7fa2..1c5f0798 100755 --- a/xenserver/etc_init.d_vswitch-xapi-update +++ b/xenserver/etc_init.d_vswitch-xapi-update @@ -27,7 +27,7 @@ function do_host_call { function start { if [ ! -f /etc/xensource-inventory ]; then - printf "vxwitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n" + printf "vswitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n" exit 1 fi source /etc/xensource-inventory |