summaryrefslogtreecommitdiff
path: root/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'utilities')
-rwxr-xr-xutilities/bugtool/ovs-bugtool-cfm-show2
-rwxr-xr-xutilities/bugtool/ovs-bugtool-coverage-show2
-rwxr-xr-xutilities/bugtool/ovs-bugtool-daemons-ver2
-rwxr-xr-xutilities/bugtool/ovs-bugtool-lacp-show2
-rwxr-xr-xutilities/bugtool/ovs-bugtool-ovsdb-dump2
-rwxr-xr-xutilities/bugtool/ovs-bugtool-tc-class-show2
-rwxr-xr-xutilities/bugtool/ovs-bugtool-vsctl-show2
-rwxr-xr-xutilities/bugtool/ovs-bugtool.in2
-rw-r--r--utilities/bugtool/plugins/kernel-info/openvswitch.xml2
-rw-r--r--utilities/bugtool/plugins/network-status/openvswitch.xml2
-rw-r--r--utilities/bugtool/plugins/system-configuration.xml2
-rw-r--r--utilities/bugtool/plugins/system-configuration/openvswitch.xml2
-rw-r--r--utilities/bugtool/plugins/system-logs/openvswitch.xml2
-rw-r--r--utilities/nlmon.c2
-rw-r--r--utilities/ovs-appctl.c2
-rw-r--r--utilities/ovs-benchmark.c2
-rw-r--r--utilities/ovs-controller.c2
-rwxr-xr-xutilities/ovs-ctl.in2
-rw-r--r--utilities/ovs-dpctl.c2
-rw-r--r--utilities/ovs-lib.in2
-rw-r--r--utilities/ovs-ofctl.c2
-rwxr-xr-xutilities/ovs-parse-leaks.in2
-rwxr-xr-xutilities/ovs-pcap.in2
-rwxr-xr-xutilities/ovs-pki-cgi.in2
-rwxr-xr-xutilities/ovs-pki.in2
-rwxr-xr-xutilities/ovs-save2
-rwxr-xr-xutilities/ovs-tcpundump.in2
-rw-r--r--utilities/ovs-vlan-bug-workaround.c2
-rwxr-xr-xutilities/ovs-vlan-test.in2
-rw-r--r--utilities/ovs-vsctl.c2
30 files changed, 30 insertions, 30 deletions
diff --git a/utilities/bugtool/ovs-bugtool-cfm-show b/utilities/bugtool/ovs-bugtool-cfm-show
index b137a2d83..ccc058bc4 100755
--- a/utilities/bugtool/ovs-bugtool-cfm-show
+++ b/utilities/bugtool/ovs-bugtool-cfm-show
@@ -14,6 +14,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2011 Nicira Networks.
+# Copyright (C) 2011 Nicira, Inc.
ovs-appctl cfm/show
diff --git a/utilities/bugtool/ovs-bugtool-coverage-show b/utilities/bugtool/ovs-bugtool-coverage-show
index 4cc55bd91..b94fd9608 100755
--- a/utilities/bugtool/ovs-bugtool-coverage-show
+++ b/utilities/bugtool/ovs-bugtool-coverage-show
@@ -14,6 +14,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2012 Nicira Networks.
+# Copyright (C) 2012 Nicira, Inc.
ovs-appctl coverage/show
diff --git a/utilities/bugtool/ovs-bugtool-daemons-ver b/utilities/bugtool/ovs-bugtool-daemons-ver
index 672e7e1b4..952ed65b4 100755
--- a/utilities/bugtool/ovs-bugtool-daemons-ver
+++ b/utilities/bugtool/ovs-bugtool-daemons-ver
@@ -14,7 +14,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2012 Nicira Networks.
+# Copyright (C) 2012 Nicira, Inc.
for f in `cd /var/run/openvswitch/; ls *.pid 2>/dev/null`
do
diff --git a/utilities/bugtool/ovs-bugtool-lacp-show b/utilities/bugtool/ovs-bugtool-lacp-show
index 2a2d72bf2..4c1728c88 100755
--- a/utilities/bugtool/ovs-bugtool-lacp-show
+++ b/utilities/bugtool/ovs-bugtool-lacp-show
@@ -14,6 +14,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2011 Nicira Networks.
+# Copyright (C) 2011 Nicira, Inc.
ovs-appctl lacp/show
diff --git a/utilities/bugtool/ovs-bugtool-ovsdb-dump b/utilities/bugtool/ovs-bugtool-ovsdb-dump
index 9e4d6620b..4eef6f56e 100755
--- a/utilities/bugtool/ovs-bugtool-ovsdb-dump
+++ b/utilities/bugtool/ovs-bugtool-ovsdb-dump
@@ -14,6 +14,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2011 Nicira Networks.
+# Copyright (C) 2011 Nicira, Inc.
ovsdb-client -f csv dump unix:/var/run/openvswitch/db.sock Open_vSwitch
diff --git a/utilities/bugtool/ovs-bugtool-tc-class-show b/utilities/bugtool/ovs-bugtool-tc-class-show
index df07f2a8c..5e6ae0a1b 100755
--- a/utilities/bugtool/ovs-bugtool-tc-class-show
+++ b/utilities/bugtool/ovs-bugtool-tc-class-show
@@ -14,7 +14,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2011 Nicira Networks.
+# Copyright (C) 2011 Nicira, Inc.
for iface in $(cd /sys/class/net && echo *); do
if [ -d /sys/class/net/$iface ]; then
diff --git a/utilities/bugtool/ovs-bugtool-vsctl-show b/utilities/bugtool/ovs-bugtool-vsctl-show
index 46ac7fbdf..fe433d83f 100755
--- a/utilities/bugtool/ovs-bugtool-vsctl-show
+++ b/utilities/bugtool/ovs-bugtool-vsctl-show
@@ -14,6 +14,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
#
-# Copyright (C) 2012 Nicira Networks.
+# Copyright (C) 2012 Nicira, Inc.
ovs-vsctl --timeout=5 show
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index 1e0fc7c30..2df3e66be 100755
--- a/utilities/bugtool/ovs-bugtool.in
+++ b/utilities/bugtool/ovs-bugtool.in
@@ -14,7 +14,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Copyright (c) 2005, 2007 XenSource Ltd.
-# Copyright (c) 2010, 2011 Nicira Networks.
+# Copyright (c) 2010, 2011 Nicira, Inc.
#
# To add new entries to the bugtool, you need to:
diff --git a/utilities/bugtool/plugins/kernel-info/openvswitch.xml b/utilities/bugtool/plugins/kernel-info/openvswitch.xml
index 8432ba92b..c571640c4 100644
--- a/utilities/bugtool/plugins/kernel-info/openvswitch.xml
+++ b/utilities/bugtool/plugins/kernel-info/openvswitch.xml
@@ -13,7 +13,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.
-->
<collect>
diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index dab05ef2f..8ae498faf 100644
--- a/utilities/bugtool/plugins/network-status/openvswitch.xml
+++ b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -13,7 +13,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- Copyright (C) 2011, 2012 Nicira Networks.
+ Copyright (C) 2011, 2012 Nicira, Inc.
-->
<collect>
diff --git a/utilities/bugtool/plugins/system-configuration.xml b/utilities/bugtool/plugins/system-configuration.xml
index a948fd24b..a59a6981d 100644
--- a/utilities/bugtool/plugins/system-configuration.xml
+++ b/utilities/bugtool/plugins/system-configuration.xml
@@ -15,7 +15,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.
-->
<capability pii="no" min_size="-1" max_size="1000000" min_time="-1" max_time="60" mime="text/plain" checked="true" hidden="true">
</capability>
diff --git a/utilities/bugtool/plugins/system-configuration/openvswitch.xml b/utilities/bugtool/plugins/system-configuration/openvswitch.xml
index 260e6dc81..ea6f32e76 100644
--- a/utilities/bugtool/plugins/system-configuration/openvswitch.xml
+++ b/utilities/bugtool/plugins/system-configuration/openvswitch.xml
@@ -13,7 +13,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.
-->
<collect>
diff --git a/utilities/bugtool/plugins/system-logs/openvswitch.xml b/utilities/bugtool/plugins/system-logs/openvswitch.xml
index 914bd5390..f73511330 100644
--- a/utilities/bugtool/plugins/system-logs/openvswitch.xml
+++ b/utilities/bugtool/plugins/system-logs/openvswitch.xml
@@ -13,7 +13,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA.
- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.
-->
<collect>
diff --git a/utilities/nlmon.c b/utilities/nlmon.c
index e6cf02355..99b060c97 100644
--- a/utilities/nlmon.c
+++ b/utilities/nlmon.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c
index f761d5ac2..ddeeb1dfa 100644
--- a/utilities/ovs-appctl.c
+++ b/utilities/ovs-appctl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-benchmark.c b/utilities/ovs-benchmark.c
index e846902d8..162f7cf0a 100644
--- a/utilities/ovs-benchmark.c
+++ b/utilities/ovs-benchmark.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index fa60f8f68..d70b63051 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 68853826b..0af90f07c 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index 56d648c28..7c191164b 100644
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 7a15aaecf..b8dc060a3 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -1,7 +1,7 @@
# This is a shell function library sourced by some Open vSwitch scripts.
# It is not intended to be invoked on its own.
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index 2b91a2894..86c0a859b 100644
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-parse-leaks.in b/utilities/ovs-parse-leaks.in
index 3f4cb16ba..72417e511 100755
--- a/utilities/ovs-parse-leaks.in
+++ b/utilities/ovs-parse-leaks.in
@@ -1,6 +1,6 @@
#! @PERL@
-# Copyright (c) 2009, 2010 Nicira Networks.
+# Copyright (c) 2009, 2010 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-pcap.in b/utilities/ovs-pcap.in
index 8ab475612..530648035 100755
--- a/utilities/ovs-pcap.in
+++ b/utilities/ovs-pcap.in
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (c) 2010 Nicira Networks.
+# Copyright (c) 2010 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-pki-cgi.in b/utilities/ovs-pki-cgi.in
index c8c53d09c..3ef900ef5 100755
--- a/utilities/ovs-pki-cgi.in
+++ b/utilities/ovs-pki-cgi.in
@@ -1,6 +1,6 @@
#! @PERL@
-# Copyright (c) 2008, 2009 Nicira Networks.
+# Copyright (c) 2008, 2009 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-pki.in b/utilities/ovs-pki.in
index e79ecc625..019ffcfad 100755
--- a/utilities/ovs-pki.in
+++ b/utilities/ovs-pki.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-save b/utilities/ovs-save
index de3129042..297c2fa3f 100755
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (c) 2011 Nicira Networks, Inc.
+# Copyright (c) 2011 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-tcpundump.in b/utilities/ovs-tcpundump.in
index 4f239057b..0268c504a 100755
--- a/utilities/ovs-tcpundump.in
+++ b/utilities/ovs-tcpundump.in
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (c) 2010 Nicira Networks.
+# Copyright (c) 2010 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-vlan-bug-workaround.c b/utilities/ovs-vlan-bug-workaround.c
index f459dec4b..8688f6172 100644
--- a/utilities/ovs-vlan-bug-workaround.c
+++ b/utilities/ovs-vlan-bug-workaround.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-vlan-test.in b/utilities/ovs-vlan-test.in
index f93784530..e2294989f 100755
--- a/utilities/ovs-vlan-test.in
+++ b/utilities/ovs-vlan-test.in
@@ -1,6 +1,6 @@
#! @PYTHON@
#
-# Copyright (c) 2010 Nicira Networks.
+# Copyright (c) 2010 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 4c5362c83..2fc87f002 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.