summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2010-02-05 15:58:27 -0800
committerJustin Pettit <jpettit@nicira.com>2010-02-05 17:14:55 -0800
commita4af00400a835eb87569ba40e21874c05e872c0f (patch)
treed9c6db715493bd6fc17c91e9552f8037c3ea7caa /ChangeLog
parent93ff0290fda0f02904686989243089faaa9229e6 (diff)
parent5819a7cdcf44f0277c538353672fb27701c764f9 (diff)
downloadopenvswitch-a4af00400a835eb87569ba40e21874c05e872c0f.tar.gz
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 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eff97aa5d..88653d3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+v0.99.1 - 25 Jan 2010
+---------------------
+ - Add support for sFlow(R)
+ - Make headers compatible with C++
+ - Bug fixes
+
+v0.99.0 - 14 Jan 2010
+---------------------
+ - User-space forwarding engine
+ - Bug fixes
+
v0.90.6 - 6 Oct 2009
--------------------
- Bug fixes