Merge "citrix" branch into "master".
authorBen Pfaff <blp@nicira.com>
Thu, 25 Mar 2010 19:30:05 +0000 (12:30 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 25 Mar 2010 19:30:05 +0000 (12:30 -0700)
commita0bc29a541fc7dc6e20137d5558e2094d614e6ab
treec1ff63045c24902262b42343b83c8ad8d962367f
parentea8cd10d2934586158734d31300f86eca381cc7a
parent347401f756e6678fced43ecee27f5107c803fda2
Merge "citrix" branch into "master".

This merge is long overdue, simply because I forgot that there were
outstanding changes on "citrix" that had not yet been merged.

The important fix here is the addition of mlockall.  This fixes some
bugs seen under stressful conditions in XenServer.
ChangeLog
configure.ac
vswitchd/ovs-vswitchd.8.in
vswitchd/ovs-vswitchd.c
xenserver/etc_init.d_vswitch
xenserver/usr_share_vswitch_scripts_sysconfig.template