diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-10-22 17:43:28 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-10-22 17:43:28 -0700 |
| commit | 3f355f47f8e7343e909ccfa854454d667baf3c38 (patch) | |
| tree | 21898eaab13a44cf3dadac0ff468a2f08d7df46a /configure.ac | |
| parent | adea354e28134f08008732062ef0c613954dc7e4 (diff) | |
| parent | 2416b8eceae7b2508fe72efbc17d9cb71b69d330 (diff) | |
| download | openvswitch-3f355f47f8e7343e909ccfa854454d667baf3c38.tar.gz | |
Merge "citrix" into "master".
This merge took a little bit of care due to two issues:
- Crossport of "interface-reconfigure" fixes from master back to
citrix that had happened and needed to be canceled out of the merge.
- New script "refresh-xs-network-uuids" added on citrix branch that
needed to be moved from /root/vswitch/scripts to
/usr/share/vswitch/scripts.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 400ea7869..c8eed7c97 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ # limitations under the License. AC_PREREQ(2.63) -AC_INIT(openvswitch, 0.90.5, ovs-bugs@openvswitch.org) +AC_INIT(openvswitch, 0.90.6, ovs-bugs@openvswitch.org) NX_BUILDNR AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) |