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 /COPYING | |
| parent | 93ff0290fda0f02904686989243089faaa9229e6 (diff) | |
| parent | 5819a7cdcf44f0277c538353672fb27701c764f9 (diff) | |
| download | openvswitch-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 'COPYING')
| -rw-r--r-- | COPYING | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -46,3 +46,7 @@ The files under ovsdb/simplejson are covered by the following license: WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Files lib/sflow*.[ch] are licensed under the terms of the InMon sFlow +licence that is available at: + http://www.inmon.com/technology/sflowlicense.txt |