Global replace of Nicira Networks.

Replaced all instances of Nicira Networks(, Inc) to Nicira, Inc.

Feature #10593
Signed-off-by: Raju Subramanian <rsubramanian@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/Makefile.am b/Makefile.am
index e138ba404a586dbc1015c2076a14d0ee7c8947c1..91adf05feb570945ab4f00fbe3f1bace0a61871f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/NOTICE b/NOTICE
index d2aa9aa13261b52ee6a109579b3676c4149d6ddb..912d7b878f1b56b35f286c6601ad6b442b8680b9 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -2,7 +2,7 @@ This file is included in compliance with the Apache 2.0 license,
 available at http://www.apache.org/licenses/LICENSE-2.0.html
 
 Open vSwitch
 available at http://www.apache.org/licenses/LICENSE-2.0.html
 
 Open vSwitch

-Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira, Inc.

 
 Apache Portable Runtime
 Copyright 2008 The Apache Software Foundation.
 
 Apache Portable Runtime
 Copyright 2008 The Apache Software Foundation.

diff --git a/acinclude.m4 b/acinclude.m4
index 69bb7727d0fe5f15a47e110ea88302db62568075..d33653dcb262c6ace17bf4e297c9ca094fdd216a 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
 # -*- autoconf -*-
 
 # -*- autoconf -*-
 

-# 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.
 #
 # 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/build-aux/sodepends.pl b/build-aux/sodepends.pl
index 3cc4c2eb48419d21ba28bbd10beefe91f6c1021a..333d037f2dcf1c735c9bfd4bef3520569545030b 100644 (file)
--- a/build-aux/sodepends.pl
+++ b/build-aux/sodepends.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2008, 2011 Nicira Networks.
+# Copyright (c) 2008, 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.
 #
 # 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/build-aux/soexpand.pl b/build-aux/soexpand.pl
index 924295cf91c3b78bee826c583852ac0f0a8c92b1..216256451a4d53f21e12dd770a5a8dc78d024483 100644 (file)
--- a/build-aux/soexpand.pl
+++ b/build-aux/soexpand.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 Nicira Networks.
+# Copyright (c) 2008 Nicira, Inc.

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # 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/configure.ac b/configure.ac
index a2fcfbabb7a179affa0ad861ef7de41a0acacb4d..53f6e976c033e9566432c127fbad2e72c631a133 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/datapath/actions.c b/datapath/actions.c
index 29038016716c161ebe63390db22cbfd8cf0bb6f2..208f260e0059ef1da9b7af8b5c0af63dda54af05 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/brcompat_main.c b/datapath/brcompat_main.c
index e7f741b618323fc34edb1a2a5fe211a4e15a1735..1671b90ba0d797e52ece40b6409908c8d9b19a06 100644 (file)
--- a/datapath/brcompat_main.c
+++ b/datapath/brcompat_main.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public


@@ -569,7 +569,7 @@ module_init(brc_init);
 module_exit(brc_cleanup);
 
 MODULE_DESCRIPTION("Open vSwitch bridge compatibility");
 module_exit(brc_cleanup);
 
 MODULE_DESCRIPTION("Open vSwitch bridge compatibility");

-MODULE_AUTHOR("Nicira Networks");
+MODULE_AUTHOR("Nicira, Inc.");

 MODULE_LICENSE("GPL");
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
 MODULE_LICENSE("GPL");
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)

diff --git a/datapath/checksum.c b/datapath/checksum.c
index 2a84e9afec3f62c300c7d5d6acb294d4d006e744..5146c6531ec5ffb29d20e91aa6101eb1768e45ef 100644 (file)
--- a/datapath/checksum.c
+++ b/datapath/checksum.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/checksum.h b/datapath/checksum.h
index 5ea2a52beec7f7ea219c873bfbea00c1d5759593..2f2ffeeb2e66ebaf7b30ebec0dee385bf3bb425c 100644 (file)
--- a/datapath/checksum.h
+++ b/datapath/checksum.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/compat.h b/datapath/compat.h
index 71fa06c1b7b183019967f2c374bd97029937e0e8..3113b961e7b4ba336a07e3bfa189df2f76f84f64 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 2fe6fdd68be053434bb1717747a2c62e70d2290a..079b3f208814bd2c8fc8bae8d6da00c6d1795301 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 18c8598f52063f70e8538a90d8cf96ef963e0ec7..affbf0e03d4980b0d8d9103eb6609536b975f77f 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 48023a9d8f47fc5ae67e8497ad6db794d9f9f1bf..683f624d23715de8500350e0d964aa39d451699e 100644 (file)
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/dp_sysfs.h b/datapath/dp_sysfs.h
index c981285540466fe297859f20faab334d49028507..526b0a130bc44593a507cdbf0ee5f7a9df046666 100644 (file)
--- a/datapath/dp_sysfs.h
+++ b/datapath/dp_sysfs.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c
index ec673cec1c6564ec78c734f360067e6aaa81ef3c..3ecacd779a869489007260518b0dc525eac034e7 100644 (file)
--- a/datapath/dp_sysfs_dp.c
+++ b/datapath/dp_sysfs_dp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/dp_sysfs_if.c b/datapath/dp_sysfs_if.c
index 436ee4901f6d712093d15b58496dc1218c012094..219a260683902c16265e255b8b5eab41380a8cd2 100644 (file)
--- a/datapath/dp_sysfs_if.c
+++ b/datapath/dp_sysfs_if.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/flow.c b/datapath/flow.c
index 9f93550811e8750f7b5387ee8ec349eb2a2e70ad..d07337c83109c30428b1fc24dcd7917288127c0d 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/flow.h b/datapath/flow.h
index 5261fa8458c48884c16a92a6d7f55a97ab7feed3..5be481e6b2635a796065d51085b6d19294a7fd99 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/genl_exec.c b/datapath/genl_exec.c
index c963489ced43412506e55f069d3bf615c351bb19..ba8dfc09de25e8048938827e4a368491e3e788d8 100644 (file)
--- a/datapath/genl_exec.c
+++ b/datapath/genl_exec.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/genl_exec.h b/datapath/genl_exec.h
index 251aa0a299067062adb3e91315ac17055e4ab79b..834de8e055c73896a657f2a924c7b36225619789 100644 (file)
--- a/datapath/genl_exec.h
+++ b/datapath/genl_exec.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index d406dbc46640e4e0ae51ecc64e8bac339a7fa87d..c2133bb4722a15b8f378f539d49d4022a51eecf2 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 33eb63c353b936db407480147131003b73e822ee..19240171005aaab2cdb9c1c815a2956aaf8fd74f 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vlan.c b/datapath/vlan.c
index 8b4e05dfed0efd192fdfacbd57cb5d0cf1a9ad7b..104ed55e194c0a11697b548f28d70e5f0f452e3d 100644 (file)
--- a/datapath/vlan.c
+++ b/datapath/vlan.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vlan.h b/datapath/vlan.h
index d6e9b32b37ff04eede7e24462608015c3e80cf85..5d3573b5b974111cadc32d3bbcd4109e69a6770c 100644 (file)
--- a/datapath/vlan.h
+++ b/datapath/vlan.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index e5b7afb8274e68c6f5b384374ef3899b99dacfa9..05a099d639076a7b6c250377cf5c289a104685ac 100644 (file)
--- a/datapath/vport-capwap.c
+++ b/datapath/vport-capwap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * Distributed under the terms of the GNU GPL version 2.
  *
  * Significant portions of this file may be copied from parts of the Linux

diff --git a/datapath/vport-capwap.h b/datapath/vport-capwap.h
index b33cc94c36783fbb4e3780f858ec97a771c868ee..5c0a6f8e4715d6db20a1bd158b9069c63593dfdf 100644 (file)
--- a/datapath/vport-capwap.h
+++ b/datapath/vport-capwap.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2012 Nicira Networks.
+ * Copyright (c) 2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-generic.c b/datapath/vport-generic.c
index b10f28afdd67c9e7f1ba5e9eb9307b496236217a..09b0b7cfa2a0275d7da7b2e0b099fbf85a1da980 100644 (file)
--- a/datapath/vport-generic.c
+++ b/datapath/vport-generic.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-generic.h b/datapath/vport-generic.h
index ff55b854d7a2959e4bf2a436b0f6082c440c5c5b..4a295c734d598300fb161ea7d41de5f66c6c012e 100644 (file)
--- a/datapath/vport-generic.h
+++ b/datapath/vport-generic.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index 3bb55f061f4a0c85ce81a2b628fc19cc8473d491..ab89c5b42df4d72ca812c9b5029fa6e2794707ae 100644 (file)
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 9647a617c9f57d1f7ee20e973dffb60c82511f86..af7fe64976dd039e47c41f7279754865ccd551fd 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-internal_dev.h b/datapath/vport-internal_dev.h
index 3454447c5f11649cf64d8ba71342337d735f9da1..9a7d30ecc6a25277b0bb0d6bc7e42e84b4ef292d 100644 (file)
--- a/datapath/vport-internal_dev.h
+++ b/datapath/vport-internal_dev.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index 05d7696faa0ee59e72fa6389ffd4ae176b2bb47d..e24e5883b1a39551f604ef80e4268009b651fbaa 100644 (file)
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-netdev.h b/datapath/vport-netdev.h
index 721810bd091de3fd955028416eaf730e16480535..c9cf5e509c8d8dc59e93de4f2f96dc8b36e2f866 100644 (file)
--- a/datapath/vport-netdev.h
+++ b/datapath/vport-netdev.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c
index ea46a8dcfc275f54c118a6ecdbd1b8a953cb5b9a..d9e8970f4842ff66f3aef3c1d199261ba3205cc7 100644 (file)
--- a/datapath/vport-patch.c
+++ b/datapath/vport-patch.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport.c b/datapath/vport.c
index b75a866a72bdc1e032393839e1aa99b7d1d3bab5..172261aa58985b010142d17d6310bc142380d9c2 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/datapath/vport.h b/datapath/vport.h
index 2aafde0153141597351ba6fea626e5a75e1ff673..b0cdeaea8bf6aa968d53954798b4e2d08b0ccb70 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.

  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public

diff --git a/debian/copyright.in b/debian/copyright.in
index 94caa87baf2e5fcb26b7d6e1d375de5444aa6b3e..71aa680365f99c8061f7d907c5ead956e319ff2e 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -8,7 +8,7 @@ Upstream Authors (from AUTHORS):
 
 Upstream Copyright Holders:
 
 
 Upstream Copyright Holders:
 

-       Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+       Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc.

        Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
        Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
        and authors listed above.
        Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
        Copyright (c) 2008,2009,2010 Citrix Systems, Inc.
        and authors listed above.

diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init
index cfcd0a3f818334e814afa12d9ccb86e5ea225d71..b073ddef07c8265ca0ff45864c98b86aac3374f9 100755 (executable)
--- a/debian/openvswitch-controller.init
+++ b/debian/openvswitch-controller.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# Copyright (c) 2011 Nicira Networks Inc.
+# Copyright (c) 2011 Nicira, Inc.

 # Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org>
 #
 # This is free software; you may redistribute it and/or modify
 # Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org>
 #
 # This is free software; you may redistribute it and/or modify

diff --git a/debian/openvswitch-datapath-source.copyright b/debian/openvswitch-datapath-source.copyright
index 32cba237a40088ab40713651ad0f12b0ad4918e7..8151de165b8c50b0f727e3cade2a8719ec8ed361 100644 (file)
--- a/debian/openvswitch-datapath-source.copyright
+++ b/debian/openvswitch-datapath-source.copyright
@@ -1,10 +1,10 @@
 Upstream Authors: 
 
 Upstream Authors: 
 

-    Nicira Networks
+    Nicira, Inc.

 
 Copyright: 
 
 
 Copyright: 
 

-    Copyright (C) 2008 Nicira Networks
+    Copyright (C) 2008 Nicira, Inc.

 
 License:
 
 
 License:
 

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index aebf21e52b81a50c72d6a6bed959019b8dc09862..b44daad8a0d89c457f39cd355dc3028ff8481e1f 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
 #! /bin/sh
 #

-# Copyright (C) 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 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.
 #
 # 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/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec
index 50242774a2933164ae28c030f02b620649e46439..94048047ce2e3d51e374a4fa4557793e26522906 100755 (executable)
--- a/debian/ovs-monitor-ipsec
+++ b/debian/ovs-monitor-ipsec
@@ -1,5 +1,5 @@
 #!/usr/bin/python
 #!/usr/bin/python

-# 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.
 #
 # 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/include/linux/openvswitch.h b/include/linux/openvswitch.h
index 0578b5fe0854b344a0c1c5d68f92f75552d0f200..f5c9cca03c5a535c612c38de1d5a66ced3e762ea 100644 (file)
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.

  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is
  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is

diff --git a/include/linux/types.h b/include/linux/types.h
index fb0574410e32b932c7f8fe5d44f1bab524bf91eb..b88fb1c049133e861da54b9e5e74216a3a6d3402 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -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.
  *
  * 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/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index ccd627398f55b29b64e037d4da6faa06c7c1a399..62fc1031323dd467294d4b64fde6cfa2fd4fda57 100644 (file)
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -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.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -20,7 +20,7 @@
 #include "openflow/openflow.h"
 #include "openvswitch/types.h"
 
 #include "openflow/openflow.h"
 #include "openvswitch/types.h"
 

-/* The following vendor extensions, proposed by Nicira Networks, are not yet
+/* The following vendor extensions, proposed by Nicira, are not yet

  * standardized, so they are not included in openflow.h.  Some of them may be
  * suitable for standardization; others we never expect to standardize. */
 
  * standardized, so they are not included in openflow.h.  Some of them may be
  * suitable for standardization; others we never expect to standardize. */
 

diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h
index 8af656b194caa34b8174a32a1b706885a817cdd5..802e80de9adc988d62fe151afa69b5bb3da778b1 100644 (file)
--- a/include/openflow/openflow-1.0.h
+++ b/include/openflow/openflow-1.0.h
@@ -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.
  *
  * 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/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index c1f5d64bc3626046b6b2fca83e33f8447a8cdcff..2b8e95b6903b60ce17fa99b868e5573dc622fe1c 100644 (file)
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -32,7 +32,7 @@
  */
 
 /*
  */
 
 /*

- * 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.
  *
  * 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/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h
index 3aaa056fce166a74d58243440b3462dc3073c1d8..7f59c07ca53b88a20301b91e1cf36d717785476e 100644 (file)
--- a/include/openflow/openflow-1.2.h
+++ b/include/openflow/openflow-1.2.h
@@ -32,7 +32,7 @@
  */
 
 /*
  */
 
 /*

- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.

  * Copyright (c) 2012 Horms Solutions Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Copyright (c) 2012 Horms Solutions Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h
index 9ef8873781eea0ffe0c4501f7565adef958adbb3..57b7d51e16617b6e1a10126d0cd727004b689ef3 100644 (file)
--- a/include/openflow/openflow-common.h
+++ b/include/openflow/openflow-common.h
@@ -32,7 +32,7 @@
  */
 
 /*
  */
 
 /*

- * 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.
  *
  * 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/include/openflow/openflow.h b/include/openflow/openflow.h
index 7ae750abc24b3b4f8f44e4c1ddeeaf93436298f5..b2516c02d01e0e39913b3779b6d8a0f85d0c2ec5 100644 (file)
--- a/include/openflow/openflow.h
+++ b/include/openflow/openflow.h
@@ -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.
  *
  * 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/include/openvswitch/brcompat-netlink.h b/include/openvswitch/brcompat-netlink.h
index d238a16f07d3705eaede6b2ccc67959b63e24468..7e5845a6a0159a34ae295e31445a64433f4b26ed 100644 (file)
--- a/include/openvswitch/brcompat-netlink.h
+++ b/include/openvswitch/brcompat-netlink.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2011 Nicira, Inc.

  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is
  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is

diff --git a/include/openvswitch/datapath-compat.h b/include/openvswitch/datapath-compat.h
index cf0e519c7cfbec15ee18d2dffd1a0b7342629ce5..338b4224c7df7c248a03adb5ccf1430ce8b73f58 100644 (file)
--- a/include/openvswitch/datapath-compat.h
+++ b/include/openvswitch/datapath-compat.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011 Nicira Networks.
+ * Copyright (c) 2011 Nicira, Inc.

  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is
  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is

diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h
index b9a1c8ea3b5901cdd01e70cd4e56e9673899bca4..c49479113264aafec923cca35309e0a7cff1fa17 100644 (file)
--- a/include/openvswitch/tunnel.h
+++ b/include/openvswitch/tunnel.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.

  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is
  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is

diff --git a/include/openvswitch/types.h b/include/openvswitch/types.h
index ad05757c12bcf3aec8b9bff9c13191acb934fa70..72caa5c385dd10272a48615e0db9dc8c80237b7a 100644 (file)
--- a/include/openvswitch/types.h
+++ b/include/openvswitch/types.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/include/sparse/arpa/inet.h b/include/sparse/arpa/inet.h
index c545f29d8bc496561fcee3364edc409232c8cb34..dd64e61764e8aa34de1bb8c2386e6d85dd45d23e 100644 (file)
--- a/include/sparse/arpa/inet.h
+++ b/include/sparse/arpa/inet.h
@@ -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.
  *
  * 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/include/sparse/assert.h b/include/sparse/assert.h
index f396761a5b07af41a7a4c93f178fa8309462d029..23c45f10b17e4312764400e96fa2c2aa47bf4be8 100644 (file)
--- a/include/sparse/assert.h
+++ b/include/sparse/assert.h
@@ -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.
  *
  * 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/include/sparse/math.h b/include/sparse/math.h
index 884c6de87a15dddc29437b35aeb8b35c04394f1f..f94c527a7e38dabf9c8e81e17c48ae2db947cc54 100644 (file)
--- a/include/sparse/math.h
+++ b/include/sparse/math.h
@@ -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.
  *
  * 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/include/sparse/netinet/in.h b/include/sparse/netinet/in.h
index ed31463addcd8599cb7abe1825ecefc3662137c1..b3924c3a1ec34ed3a8f0d21b4a9b3f198b8cdd4f 100644 (file)
--- a/include/sparse/netinet/in.h
+++ b/include/sparse/netinet/in.h
@@ -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.
  *
  * 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/include/sparse/netinet/ip6.h b/include/sparse/netinet/ip6.h
index c6608a1447d31e7b2da831897cb17003335411f5..ca80c970c65f21657a174830714cef8818413b88 100644 (file)
--- a/include/sparse/netinet/ip6.h
+++ b/include/sparse/netinet/ip6.h
@@ -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.
  *
  * 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/include/sparse/sys/socket.h b/include/sparse/sys/socket.h
index 1ed195b2552a16965f960228e5e2be3df5092f11..d7e17ea1230c72eeec39f82b93d94e3a36a4c14c 100644 (file)
--- a/include/sparse/sys/socket.h
+++ b/include/sparse/sys/socket.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/include/sparse/sys/wait.h b/include/sparse/sys/wait.h
index 31e1d76a6b1083b4ccdf928f8ff4a21817130a7a..dbc2d9cd10d9225799b19529d94c1465e7526969 100644 (file)
--- a/include/sparse/sys/wait.h
+++ b/include/sparse/sys/wait.h
@@ -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.
  *
  * 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/lib/aes128.c b/lib/aes128.c
index aa7f5609b9e4fab74ae90a798af2b2c8815eb3e6..b95cc5632cda9c0efe43ef2789532f717257ac16 100644 (file)
--- a/lib/aes128.c
+++ b/lib/aes128.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/aes128.h b/lib/aes128.h
index bbd74754fe2852915b376e93189cd98a9d9c6b48..f0f55d7cf0c6c5abde39035e715a2b82629a5fbb 100644 (file)
--- a/lib/aes128.h
+++ b/lib/aes128.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/automake.mk b/lib/automake.mk
index 2d2617ea7356992a317994aeef2a8d71e20b2262..62175268626f39ba16a6ced42a18d9341fae95a9 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/lib/autopath.c b/lib/autopath.c
index b8ba3c1731d99cba23cc46b5a2c20074eda27903..9511a6d2a2779ff46c592e9fce82cf37134038f5 100644 (file)
--- a/lib/autopath.c
+++ b/lib/autopath.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.
  *
  * 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/lib/autopath.h b/lib/autopath.h
index 19e2d073e77efbc203b259041bed9a025f41fcd1..480d40aec6b220d29711676810ee0a71e842c2ce 100644 (file)
--- a/lib/autopath.h
+++ b/lib/autopath.h
@@ -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.
  *
  * 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/lib/backtrace.c b/lib/backtrace.c
index 1c0dfd6c1ff58e5e1a8295129752543635cc972a..c6829d77c19bda1feef4cec6ad8f58ae40266145 100644 (file)
--- a/lib/backtrace.c
+++ b/lib/backtrace.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.
  *
  * 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/lib/backtrace.h b/lib/backtrace.h
index b1f25fae8cba3cca1e68285f26b1403400fbabcf..cee0602f30f88a962565f9ae4da11db91d051f11 100644 (file)
--- a/lib/backtrace.h
+++ b/lib/backtrace.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/bitmap.c b/lib/bitmap.c
index 76a667a04eb9337c3afed60afbc7ccac99b586e9..d607526d5f55be3234ac0be98fe8b324819c5674 100644 (file)
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/bitmap.h b/lib/bitmap.h
index c76e45f39b602bbb35529ee49150fd0996eba5ee..47b77e7326aed77d6e9f0ade5cff446461ca7135 100644 (file)
--- a/lib/bitmap.h
+++ b/lib/bitmap.h
@@ -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.
  *
  * 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/lib/bond.c b/lib/bond.c
index 3b86ee486f05de10685835fc9f85f921ef82e9d6..cffdae249f63b45f04f43e9ba0127cd8b2cf9506 100644 (file)
--- a/lib/bond.c
+++ b/lib/bond.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.
  *
  * 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/lib/bond.h b/lib/bond.h
index 6d8161d82ff6820a5a21749a5ca3606529a1c8ec..7329db7c0a97e3ac1ad9ac33da5e6b3d35150d7c 100644 (file)
--- a/lib/bond.h
+++ b/lib/bond.h
@@ -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.
  *
  * 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/lib/bundle.c b/lib/bundle.c
index 733d79a989316892ede97627d45bd8f8523f7631..a2059740c3001e0b8622cb98087fe40d04c6b722 100644 (file)
--- a/lib/bundle.c
+++ b/lib/bundle.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012 Nicira Networks.
+/* Copyright (c) 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.
  *
  * 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/lib/bundle.h b/lib/bundle.h
index 580ecf81191fb42b24a365f8d1de6fb4d211aeba..4c0dff5dcf0c2dcf2add796ea9574c31ce79a5e5 100644 (file)
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/byte-order.h b/lib/byte-order.h
index 993137fb71f6a8d1605db75738bd5a0b69a21d9e..1eba6fe00ef508302fb46aa54094d2d9d7d51758 100644 (file)
--- a/lib/byte-order.h
+++ b/lib/byte-order.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/byteq.c b/lib/byteq.c
index aa1e06f7196a39788f6e3a7446ba892176b1a33c..c43dff785eaa69f0971d7125caa6701d48b33660 100644 (file)
--- a/lib/byteq.c
+++ b/lib/byteq.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* 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.
  *
  * 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/lib/byteq.h b/lib/byteq.h
index 84d8696fea3135e401956ba9970badb95afe7402..5fa51fd6598502760748a93bc166e59f0f93827b 100644 (file)
--- a/lib/byteq.h
+++ b/lib/byteq.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009 Nicira Networks, Inc.
+/* 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.
  *
  * 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/lib/cfm.c b/lib/cfm.c
index 38de68f79ce0d94aecb3a1bbda04daa7335b48c1..c2e2a6ca951c198b31264992489a610435319a9a 100644 (file)
--- a/lib/cfm.c
+++ b/lib/cfm.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.
  *
  * 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/lib/cfm.h b/lib/cfm.h
index 509da2b21c3e1b42b03878069d819327651e099c..4e421fbd68afdde975b7189327440b976e65f0aa 100644 (file)
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011 Nicira Networks.
+/* Copyright (c) 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.
  *
  * 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/lib/classifier.c b/lib/classifier.c
index 30cc31d32653c8d849b146d471263b061c01a3ec..e11a585257e6da017b342b8b70523801c63418c0 100644 (file)
--- a/lib/classifier.c
+++ b/lib/classifier.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.
  *
  * 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/lib/classifier.h b/lib/classifier.h
index 48eb59629a8bab669ffc2bd4ef4464bace015f72..92ccc2fbbdaa1be6ea479d97f0b2c2a0aaec95a5 100644 (file)
--- a/lib/classifier.h
+++ b/lib/classifier.h
@@ -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.
  *
  * 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/lib/command-line.c b/lib/command-line.c
index 9adf47f4d34fceae07808d9f625a7e3db6c371f4..ca443a344972e43da8681ca47175c08edd169426 100644 (file)
--- a/lib/command-line.c
+++ b/lib/command-line.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.
  *
  * 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/lib/command-line.h b/lib/command-line.h
index 1c8800335c7ada332204d7b7049295511fef6c9d..803f43395faa9619d7af902a1862d5a3880d9c4d 100644 (file)
--- a/lib/command-line.h
+++ b/lib/command-line.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/compiler.h b/lib/compiler.h
index 0d7ee9f6f27c597479f1db3d4ae5371598d1fbc0..75e86103a7dabddcccfcc316f28ddf3326f1f0f7 100644 (file)
--- a/lib/compiler.h
+++ b/lib/compiler.h
@@ -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.
  *
  * 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/lib/coverage.c b/lib/coverage.c
index ee27af02bccff8d978995e011c37a6ad9bbca673..f1524747d7831c56eefd41cc9a2065c7fe37e49c 100644 (file)
--- a/lib/coverage.c
+++ b/lib/coverage.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.
  *
  * 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/lib/coverage.h b/lib/coverage.h
index 0f389bfea8459651e79b1b3facb38b4730ce80a5..968c48914183183c512872d71b8268d333368131 100644 (file)
--- a/lib/coverage.h
+++ b/lib/coverage.h
@@ -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.
  *
  * 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/lib/csum.c b/lib/csum.c
index 47e803e3975c86ea09bc5f3245de99f6d5c9aeda..98a83de2eafa56e96f17cd525579dd89fa3505f7 100644 (file)
--- a/lib/csum.c
+++ b/lib/csum.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.
  *
  * 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/lib/csum.h b/lib/csum.h
index e5f35e94ee08688af8c243e23e496b5256a4bfa2..12402d703f27bc772a95cf47ca48878b07816090 100644 (file)
--- a/lib/csum.h
+++ b/lib/csum.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/daemon.c b/lib/daemon.c
index 8ef5491a7dd321cfb1db98406600318807b50e21..c4a82647f8ace909101e36d89409a024cce9b70d 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.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.
  *
  * 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/lib/daemon.h b/lib/daemon.h
index 1b4f988e3fbe627be1a55d5ad4bf9dfb1e7a7969..8d5259433994db703d5a48ed4cc89413f3367596 100644 (file)
--- a/lib/daemon.h
+++ b/lib/daemon.h
@@ -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.
  *
  * 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/lib/dhcp.h b/lib/dhcp.h
index 8858cd599e1910e49ec407fc74ece67c4e508841..6f97298ca2f57e10ee68466432a84d2e69a2fe08 100644 (file)
--- a/lib/dhcp.h
+++ b/lib/dhcp.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/dhparams.h b/lib/dhparams.h
index 38cede03d9ab8fff607f1b211797cff73911084c..54f9c5fbc01b68ecd2045b8db0b4d99df7f2395b 100644 (file)
--- a/lib/dhparams.h
+++ b/lib/dhparams.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * 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/lib/dirs.c.in b/lib/dirs.c.in
index 5b6b8748a1fe5fb2c7201ca34143f940aef8291b..a5d9f317bca33ab194204a577a0140edaa9eb6b7 100644 (file)
--- a/lib/dirs.c.in
+++ b/lib/dirs.c.in
@@ -1,6 +1,6 @@
 #line 2 "@srcdir@/lib/dirs.c.in"
 /*
 #line 2 "@srcdir@/lib/dirs.c.in"
 /*

- * 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.
  *
  * 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/lib/dirs.h b/lib/dirs.h
index 57107ff5029f6cf943326606155526f4fc5c5cc0..6b4d1ceedde4f9cebca4baa169613f01dce548cf 100644 (file)
--- a/lib/dirs.h
+++ b/lib/dirs.h
@@ -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.
  *
  * 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/lib/dpif-linux.c b/lib/dpif-linux.c
index 932b36f0c64e4d1be1d70ad1acb8080ab93db42f..3b2fba3c0f87d053c475fea6e2fd2989023f659e 100644 (file)
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.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.
  *
  * 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/lib/dpif-linux.h b/lib/dpif-linux.h
index b08d28e5ccc129d9e56983a8528eff247cb1fef5..c9150b0d6e21a59ac0177546d2e8001ccc5d3fa9 100644 (file)
--- a/lib/dpif-linux.h
+++ b/lib/dpif-linux.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/dpif-netdev.c b/lib/dpif-netdev.c
index a33fe23ddca79057eb0df024e7d8fb05ebd196f8..a6c06fe9de91e4d7f0e61979a3f36c384708c2ed 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.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.
  *
  * 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/lib/dpif-provider.h b/lib/dpif-provider.h
index 6338f50ac02525a85afdef309203f5e54c73fe9d..594ce592031b0a268915be5343d8a38bdee278a6 100644 (file)
--- a/lib/dpif-provider.h
+++ b/lib/dpif-provider.h
@@ -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.
  *
  * 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/lib/dpif.c b/lib/dpif.c
index 7cf5fba4b3ce82b5eab102253bf9a6ac68bd8563..4d7e8b3928b09ad7d869cbdf28269a1fa3c85107 100644 (file)
--- a/lib/dpif.c
+++ b/lib/dpif.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.
  *
  * 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/lib/dpif.h b/lib/dpif.h
index bdd4fee6aa80b83bab80e5eeefd4443fc73d2cad..02029150ecb5d458d3f7652eb56b664aa23660da 100644 (file)
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -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.
  *
  * 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/lib/dummy.c b/lib/dummy.c
index a07830a6aa8aa7d7f5012d3fc6dec72c7fa4c957..1354de6262c996088e8601674159a9599ad00a9c 100644 (file)
--- a/lib/dummy.c
+++ b/lib/dummy.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.
  *
  * 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/lib/dummy.h b/lib/dummy.h
index abbb36387005fc6c714d54f0c8b3e40eba5f3b35..220417078c7f47ac2260b0b6e9b01d6a0cbb735a 100644 (file)
--- a/lib/dummy.h
+++ b/lib/dummy.h
@@ -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.
  *
  * 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/lib/dynamic-string.c b/lib/dynamic-string.c
index 8e583027e7605c6d6230e597c7c1625b73c42597..e672af41f43b51dfc382e3bb1d3e1cb4e5e1f891 100644 (file)
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.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.
  *
  * 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/lib/dynamic-string.h b/lib/dynamic-string.h
index a8a27ad8307da2e3ce0ad7468346bc7b548d0f2c..871021572d731ac52df3b9445de97ba2aff0ea05 100644 (file)
--- a/lib/dynamic-string.h
+++ b/lib/dynamic-string.h
@@ -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.
  *
  * 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/lib/entropy.c b/lib/entropy.c
index f38655cd2e1971fe806562c099c839385fc267f4..c1f08868795505b06a7bb76db6f36e9c3099d73a 100644 (file)
--- a/lib/entropy.c
+++ b/lib/entropy.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/entropy.h b/lib/entropy.h
index 6d256e0b945486579b24ad72a84fbf42bb2b6f36..6322b9f74623a2caa40186d7441d33a4697eaa99 100644 (file)
--- a/lib/entropy.h
+++ b/lib/entropy.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/fatal-signal.c b/lib/fatal-signal.c
index a6ce1b78c9a3eb949851c7f6cf9404a8bcbcf873..7932a097568363f049a083c0e84bc5144e883c56 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.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.
  *
  * 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/lib/fatal-signal.h b/lib/fatal-signal.h
index 94a1f1fb65008fa7a353ee33223e7b00f2713a62..8a1a84b8c4597ee5ca8809d3e8b7e91aae5d950c 100644 (file)
--- a/lib/fatal-signal.h
+++ b/lib/fatal-signal.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/flow.c b/lib/flow.c
index ef1dd6d208c9e70eec0a6daea598f0c370b97254..fc616106e56b541844ca86e8ded408896c386711 100644 (file)
--- a/lib/flow.c
+++ b/lib/flow.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.
  *
  * 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/lib/flow.h b/lib/flow.h
index 41e63865f650b099c684dcb634b4fc9e72803b28..7ee9a2687d1f066ad81fde0141323c3fb166030e 100644 (file)
--- a/lib/flow.h
+++ b/lib/flow.h
@@ -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.
  *
  * 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/lib/hash.c b/lib/hash.c
index a77da7dcb6180b73189003aa5cc0fd5490b2befd..f7aa9163363a85386fee596d8c5f115006a9df61 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/hash.h b/lib/hash.h
index 05799b2e27eba3f63a7da5da669509d48e96d9bc..ac6a63cff40bb4204b431e60ddc323b4ff15e418 100644 (file)
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/heap.c b/lib/heap.c
index 77b7955cc397dd97ee11c2271417e4862a88c8e3..b2d547a5e6575df5d11c9232b195718fcfa1a68f 100644 (file)
--- a/lib/heap.c
+++ b/lib/heap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/heap.h b/lib/heap.h
index 8cfcf70fdb3c43006b7b85a0cc2504b862018f46..9326d79a2d2ade5b8d48d20e0507af0fc2627bc1 100644 (file)
--- a/lib/heap.h
+++ b/lib/heap.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/hmap.c b/lib/hmap.c
index 5862b62783ea56c5b92f7831a1754f98e1af093b..19710295da2c0fe0785c76ff345ef9ae8d2c7a23 100644 (file)
--- a/lib/hmap.c
+++ b/lib/hmap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/hmap.h b/lib/hmap.h
index 246fba2cb976cd25a5a76590e4d5aa00fecca097..9d07e842043f4666d79e2fe633bb45348ab5beac 100644 (file)
--- a/lib/hmap.h
+++ b/lib/hmap.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/hmapx.c b/lib/hmapx.c
index bcdd7a85adace468a6e7888d38de6775001ddd2f..1c324c4df3d35f500ba4eda48d65053dc9a6cc8f 100644 (file)
--- a/lib/hmapx.c
+++ b/lib/hmapx.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.
  *
  * 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/lib/hmapx.h b/lib/hmapx.h
index 226255dce7285628ae8c7e149ed9bb3e4a6d3bb3..9b00a5deb57201c3912a3d7207e37a8ad293a4d7 100644 (file)
--- a/lib/hmapx.h
+++ b/lib/hmapx.h
@@ -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.
  *
  * 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/lib/json.c b/lib/json.c
index d514a90dd202c847d8254a840eeee909b3a98ee3..ddce335a0bf33638238c3e2c3ac46bad4d3caeeb 100644 (file)
--- a/lib/json.c
+++ b/lib/json.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/json.h b/lib/json.h
index 5c32c06cd42f166ef58aae3b031dd9558604742b..cfe9457ef82c641d76c47e4df7ec43a114c76c89 100644 (file)
--- a/lib/json.h
+++ b/lib/json.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/jsonrpc.c b/lib/jsonrpc.c
index 4ebff104a96180136b4c31b214b5eb2b7c8ec04e..5c3359cb241d929ee1c1f1b5f03237d34d8bc3ff 100644 (file)
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.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.
  *
  * 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/lib/jsonrpc.h b/lib/jsonrpc.h
index 16131d333b21c5109fc58eb2fa319f0dc4170879..cd78170cf9e3cb31f02b36a7e5eebca8249868b3 100644 (file)
--- a/lib/jsonrpc.h
+++ b/lib/jsonrpc.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 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.
  *
  * 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/lib/lacp.c b/lib/lacp.c
index 9d6fb9b18df568ca4e9e647f3bb62b365a9d01ac..e1d365d377e3406b2ea729d32ca809c9b27ae79b 100644 (file)
--- a/lib/lacp.c
+++ b/lib/lacp.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/lacp.h b/lib/lacp.h
index 5e1982601f4a8774497da9c6697eab05acf13fb8..624e3682dc9df81a637630c7da0ee7577bf4e3a6 100644 (file)
--- a/lib/lacp.h
+++ b/lib/lacp.h
@@ -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.
  *
  * 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/lib/leak-checker.c b/lib/leak-checker.c
index 42b3818ab511f2a469b08c5145efc60e86938aa7..1fd3d5b5fb656b36cabdf7417ecf477d86a82738 100644 (file)
--- a/lib/leak-checker.c
+++ b/lib/leak-checker.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/leak-checker.h b/lib/leak-checker.h
index f6ee5c13342512cb170d575a11cb5fe4759b718a..e74cd9d8050c22b37bc482d6574a0aa1269755c7 100644 (file)
--- a/lib/leak-checker.h
+++ b/lib/leak-checker.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/learn.c b/lib/learn.c
index 7f30f6ee0653c0e11586e03fc8ab6d2ed0d1ba7d..e995c29cf9f35647a7e871f95f86c98abd2b11a9 100644 (file)
--- a/lib/learn.c
+++ b/lib/learn.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/learn.h b/lib/learn.h
index b83bee20d9d873cdaa310a5883ecbeeead897d52..28591727cef1ae9d4c971e683f5a4b68a89c3081 100644 (file)
--- a/lib/learn.h
+++ b/lib/learn.h
@@ -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.
  *
  * 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/lib/learning-switch.c b/lib/learning-switch.c
index 23d26e7bfc18ee117d0961d8bc5d7a8b58c86a89..74f51feadbc43c3ed44be783954a49fba157be83 100644 (file)
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.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.
  *
  * 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/lib/learning-switch.h b/lib/learning-switch.h
index 833b94da6387a9da04e8eee21751bf5334ba40a0..e42aec16a47af9314e060cbbfaa886a649df2ddb 100644 (file)
--- a/lib/learning-switch.h
+++ b/lib/learning-switch.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/list.c b/lib/list.c
index a236f8c73bfaf4232c9331dd46ab216f3f6f23ca..71790cc373e78a393e362f257ea10c540102556d 100644 (file)
--- a/lib/list.c
+++ b/lib/list.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.
  *
  * 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/lib/list.h b/lib/list.h
index 91c39663552f3e2cf8435e5571f835b69c983372..8ffa797dbc12889e216042aa7fd74680caaa05f7 100644 (file)
--- a/lib/list.h
+++ b/lib/list.h
@@ -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.
  *
  * 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/lib/lockfile.c b/lib/lockfile.c
index 43ccaf98a21387fa448cfa9fa779994373e79c43..e0f6328710bd6ab52e4cd0e7a81428f923d8a720 100644 (file)
--- a/lib/lockfile.c
+++ b/lib/lockfile.c
@@ -1,4 +1,4 @@
- /* 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.
  *
  * 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/lib/lockfile.h b/lib/lockfile.h
index c52fa2159a889590c4cab1576f4dd3f656e2ba48..202134b41c318c5adbacdc42c65ce64830644557 100644 (file)
--- a/lib/lockfile.h
+++ b/lib/lockfile.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/mac-learning.c b/lib/mac-learning.c
index 68fc62143aaf0fdc244b11f440231615172d40bf..3c541af2bbd846f3e8fbc34fc01098f1695f971f 100644 (file)
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.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.
  *
  * 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/lib/mac-learning.h b/lib/mac-learning.h
index df8ea90ec791930acad1792e6f36124b2a990bb5..8f8fd45875624d5a9891f0a98fd356f872fde3e0 100644 (file)
--- a/lib/mac-learning.h
+++ b/lib/mac-learning.h
@@ -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.
  *
  * 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/lib/meta-flow.c b/lib/meta-flow.c
index 51db7b1edfd44dc8727089bbce5e0747cb90e46a..c1efbe2c14dd509189d9af45cc969d08fe598459 100644 (file)
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/meta-flow.h b/lib/meta-flow.h
index 6340b3e940a8f41ac14c08a8fb37e8e77db02409..662778c74a1f47bf30acdac443b0f94c1ae31b0d 100644 (file)
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/multipath.c b/lib/multipath.c
index 46976fb2ac4bc7c1dd7846c8698ab714b32bc244..8d93211181a8fbe518c7961c2c783b30aff0f319 100644 (file)
--- a/lib/multipath.c
+++ b/lib/multipath.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.
  *
  * 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/lib/multipath.h b/lib/multipath.h
index 3c4ff450e7114a47dd27aa2572a3b0111d662e47..2cd646cbb3f12824889c54e89e2553ac6a322617 100644 (file)
--- a/lib/multipath.h
+++ b/lib/multipath.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 083a4ddb518e26822d7f238cea1bf1b73202e605..b8c23c5835b4f9b20e655a991e4361b7a429a6a2 100644 (file)
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.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.
  *
  * 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/lib/netdev-linux.c b/lib/netdev-linux.c
index d2a5c7acc782b4ea921cabcc16e61d8dbaa22698..4d2f3ac0977c8f3c7dbb71318cd6a7157758dd91 100644 (file)
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.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.
  *
  * 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/lib/netdev-linux.h b/lib/netdev-linux.h
index 21a2db2587735e1117d10b32160fe0e96ac1488d..e404e469d713168c19e3a65fe14317005bcd3f28 100644 (file)
--- a/lib/netdev-linux.h
+++ b/lib/netdev-linux.h
@@ -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.
  *
  * 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/lib/netdev-provider.h b/lib/netdev-provider.h
index 6daae5e6ca5932bd22ed211f0021e62a103ac645..080b76a6840b71eb3ee32e3965c0056e901e42cf 100644 (file)
--- a/lib/netdev-provider.h
+++ b/lib/netdev-provider.h
@@ -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.
  *
  * 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/lib/netdev-vport.c b/lib/netdev-vport.c
index 6a6cd51ab956b2bb80e80b4d0940ec51a61a791a..1721f6bd57e6a9ffa1dc85aa0eb03e60b2b5c9c0 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.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.
  *
  * 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/lib/netdev-vport.h b/lib/netdev-vport.h
index 2df6d55a1000958d6a5e91fbe34abeb113be2ba1..d96a318659bdb08b18abe6bfeefba78f5c727522 100644 (file)
--- a/lib/netdev-vport.h
+++ b/lib/netdev-vport.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/netdev.c b/lib/netdev.c
index 2652a3fde4a085c06296d08f18d025e9e4c3b51f..e4e7ab132eea510f1dce5a48ca16ada912c2ad7a 100644 (file)
--- a/lib/netdev.c
+++ b/lib/netdev.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.
  *
  * 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/lib/netdev.h b/lib/netdev.h
index bff110116f32a7a924239db0fc20bda61f9d734d..4b86c21efcc3ca9d92790fc00c4a21d8c635259e 100644 (file)
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -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.
  *
  * 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/lib/netflow.h b/lib/netflow.h
index 49202d981c453939db5c1d8be88e9e0986e93e69..321f64cccb3116a0724704b9a0b4f22be1f19ae3 100644 (file)
--- a/lib/netflow.h
+++ b/lib/netflow.h
@@ -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.
  *
  * 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/lib/netlink-notifier.c b/lib/netlink-notifier.c
index 7ef3d6c49a698a55aff202da871e0b8ff0e0152a..8f6daff8d8bcc858141aa634bb691f18f66b62d8 100644 (file)
--- a/lib/netlink-notifier.c
+++ b/lib/netlink-notifier.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.
  *
  * 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/lib/netlink-notifier.h b/lib/netlink-notifier.h
index 26aa671e23914f1ec4603e2af2e3f502a92d2bc3..4bd90f1dcde56748f919e91b6b1cdd6f5f95471b 100644 (file)
--- a/lib/netlink-notifier.h
+++ b/lib/netlink-notifier.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/netlink-protocol.h b/lib/netlink-protocol.h
index 3f4ce3538b3e08508c605c19913616173690343c..3009fc538b7c75266aa6e9cff692d35d500ae3e7 100644 (file)
--- a/lib/netlink-protocol.h
+++ b/lib/netlink-protocol.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/netlink-socket.c b/lib/netlink-socket.c
index a46319f8b493b35c5ae7470c13bfbeb7fb5966a6..713049aab0ed2367b472eb646830002700d7b8ce 100644 (file)
--- a/lib/netlink-socket.c
+++ b/lib/netlink-socket.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.
  *
  * 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/lib/netlink-socket.h b/lib/netlink-socket.h
index 023261602365a7f741528c60f1d297059bedc6e4..e74bc98374f73572381dcc66a3f981970a633b45 100644 (file)
--- a/lib/netlink-socket.h
+++ b/lib/netlink-socket.h
@@ -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.
  *
  * 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/lib/netlink.c b/lib/netlink.c
index 6e0701c46eaf9cdf6941caea7f5a34393d241271..5414239c794ecf4254f0830a7c2c62943fc1231d 100644 (file)
--- a/lib/netlink.c
+++ b/lib/netlink.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.
  *
  * 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/lib/netlink.h b/lib/netlink.h
index 7eced42f42a660f178ccdb28548240c00179e70c..a5c129ab296836aee2e9ecd9e48916301a1b26a0 100644 (file)
--- a/lib/netlink.h
+++ b/lib/netlink.h
@@ -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.
  *
  * 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/lib/nx-match.c b/lib/nx-match.c
index 91dd7fc50ed5bb12ac00ee96f44a0954bce20f80..34c8354bc265038fe84893b0d8d59d6d3c340484 100644 (file)
--- a/lib/nx-match.c
+++ b/lib/nx-match.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.
  *
  * 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/lib/nx-match.h b/lib/nx-match.h
index 296a63a057cc10099ec607dd922daeed629ccd41..a039225d8e2b9e9554ec301e87c6a400643db754 100644 (file)
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -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.
  *
  * 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/lib/odp-util.c b/lib/odp-util.c
index 8fa3359493b11523fb43a729e06bf45c2e727210..36ea5a4cf93b311095f7d14f5f07785a7e2234e4 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.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.
  *
  * 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/lib/odp-util.h b/lib/odp-util.h
index 00284996fe849ee32ed046f4fbb29595218df5aa..0ea801ad9a6f390a7551e6c6e6e7348e7836e1c1 100644 (file)
--- a/lib/odp-util.h
+++ b/lib/odp-util.h
@@ -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.
  *
  * 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/lib/ofp-errors.h b/lib/ofp-errors.h
index 40e5a61ab22c84bf31c239be5a27b381f6756a3b..5f908db6ab644e1e169a7f0b8d58f0930409257e 100644 (file)
--- a/lib/ofp-errors.h
+++ b/lib/ofp-errors.h
@@ -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.
  *
  * 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/lib/ofp-parse.c b/lib/ofp-parse.c
index 3f7a02124c33117f769508772e8c0a90e2fa3df2..f4845f6db020c84dd554932d999c690a9290e75b 100644 (file)
--- a/lib/ofp-parse.c
+++ b/lib/ofp-parse.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.
  *
  * 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/lib/ofp-parse.h b/lib/ofp-parse.h
index c552caa51080636f7b27c51bd4576122b430280b..5a50d9498cb5d9f7a2ab19c4cd23fc52ae0c412e 100644 (file)
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -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.
  *
  * 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/lib/ofp-print.c b/lib/ofp-print.c
index d0fd22906f0303b4b239fc358cf4ecb9d12f0bd0..5b840982fb775307279af0af65ce2f2b3014a2fb 100644 (file)
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.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.
  *
  * 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/lib/ofp-print.h b/lib/ofp-print.h
index ad204b1e4c923d45266b643c670885a0ed86ca0b..8704f57cc5ed87739505cbd222841f337d2201cc 100644 (file)
--- a/lib/ofp-print.h
+++ b/lib/ofp-print.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/ofp-util.c b/lib/ofp-util.c
index ae9b30d31b1265cfdbb65436715755d5ff5506d0..43776d58b2c35c1f57506563ffea24ef8ea836a5 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.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.
  *
  * 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/lib/ofp-util.h b/lib/ofp-util.h
index fd76eace96cb9da0ff6442a2952d5d1d48e8abda..bf2ae07ba7639fb29d50413ecae19b07d3f51244 100644 (file)
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -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.
  *
  * 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/lib/ofpbuf.c b/lib/ofpbuf.c
index a98242091d27a33372c4e1834b0192f843cd0b6c..02e5aa870ed7669ae4c0fd31ba02b7e4838efc04 100644 (file)
--- a/lib/ofpbuf.c
+++ b/lib/ofpbuf.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.
  *
  * 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/lib/ofpbuf.h b/lib/ofpbuf.h
index 37f445328e70159ab23c8875950fb55254249930..520455dc36ed7a5d3708ea9b39f6e1b98471e40c 100644 (file)
--- a/lib/ofpbuf.h
+++ b/lib/ofpbuf.h
@@ -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.
  *
  * 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/lib/ovsdb-data.c b/lib/ovsdb-data.c
index d9787185fb917c1df2cdf5d9d99127bccb4db15c..58c2a10a076fc98936ea398c6b28b3ed42d07089 100644 (file)
--- a/lib/ovsdb-data.c
+++ b/lib/ovsdb-data.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/ovsdb-data.h b/lib/ovsdb-data.h
index 181df3b126890490a8b61dc9dc64dcce9b7bd0a0..360986633868584e0ba58634c808331b43ee2b0d 100644 (file)
--- a/lib/ovsdb-data.h
+++ b/lib/ovsdb-data.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/ovsdb-error.c b/lib/ovsdb-error.c
index c5a4ad4ca5801385a52a8b49dbc45aa98c2e1f00..eb9f1eee410552116e484a9fb47d55bc73c401a9 100644 (file)
--- a/lib/ovsdb-error.c
+++ b/lib/ovsdb-error.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/ovsdb-error.h b/lib/ovsdb-error.h
index 89b0c19b2966c9ec47302623dc6c09915a5b1000..5f39c3ed3d27c3813c835c0aa75f904eeb772334 100644 (file)
--- a/lib/ovsdb-error.h
+++ b/lib/ovsdb-error.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/ovsdb-idl-provider.h b/lib/ovsdb-idl-provider.h
index ef37d92183ae976ed384ee91d65148f124314f67..95254b7509b8cf15a0e83136d22901a27b6594e5 100644 (file)
--- a/lib/ovsdb-idl-provider.h
+++ b/lib/ovsdb-idl-provider.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks.
+/* Copyright (c) 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.
  *
  * 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/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
index bb7da668aebce0f7478f346018ef037229354388..3d4cbd44867206462efc64e3dbe3af6acdd9485e 100644 (file)
--- a/lib/ovsdb-idl.c
+++ b/lib/ovsdb-idl.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/ovsdb-idl.h b/lib/ovsdb-idl.h
index 33cd3401b4dbf91751e1d391f9f915538bd651f4..c48ad1bda3c9c5059ffb071c07452a4e9957c41d 100644 (file)
--- a/lib/ovsdb-idl.h
+++ b/lib/ovsdb-idl.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/ovsdb-parser.c b/lib/ovsdb-parser.c
index c46c237ebd20deec3769d2544794985cfc03e04b..77460a8f5fda74a279be3bdc108bc16dbaae7b07 100644 (file)
--- a/lib/ovsdb-parser.c
+++ b/lib/ovsdb-parser.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011 Nicira Networks
+/* Copyright (c) 2009, 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.
  *
  * 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/lib/ovsdb-parser.h b/lib/ovsdb-parser.h
index 44586aa7f3b69a05fc146a1617dabd3bc34e4fa2..75bf6e48e93a88606a59ff25b151e5f5720169ae 100644 (file)
--- a/lib/ovsdb-parser.h
+++ b/lib/ovsdb-parser.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/ovsdb-types.c b/lib/ovsdb-types.c
index 959f08754363485c38d96f1c887ccc2123240744..b47bfad3987c160cbee1abe72bf5ce49b7694704 100644 (file)
--- a/lib/ovsdb-types.c
+++ b/lib/ovsdb-types.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/ovsdb-types.h b/lib/ovsdb-types.h
index a7b4e20846e4f407a28d8061c9969274698cde94..efd83a7916971b5aa5282d727b50b49536367fbb 100644 (file)
--- a/lib/ovsdb-types.h
+++ b/lib/ovsdb-types.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/packets.c b/lib/packets.c
index cd9227b36088121845e235fe3021551733d0e0ab..84ca590bda90d23af12b1f8a9d82f2813728faa1 100644 (file)
--- a/lib/packets.c
+++ b/lib/packets.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.
  *
  * 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/lib/packets.h b/lib/packets.h
index dc71b0532ef4f6c798a976e435d5ad4fd60857e9..f9e5bb6cef61ef44e6f63d68d356df238611be37 100644 (file)
--- a/lib/packets.h
+++ b/lib/packets.h
@@ -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.
  *
  * 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/lib/pcap.c b/lib/pcap.c
index 9c95c4092ad984b8b47a80860c1347b7e22447a6..aa63be36a3ccdbb1e6e6eb5a645337d220e970c2 100644 (file)
--- a/lib/pcap.c
+++ b/lib/pcap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/pcap.h b/lib/pcap.h
index 7ea0f237cdaa730f02196598615e3da4dfd20f2e..43a43063a67b9668d168a6df97846d4de8f62a2d 100644 (file)
--- a/lib/pcap.h
+++ b/lib/pcap.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/poll-loop.c b/lib/poll-loop.c
index 76fbc1d24f31af811253eb73917732b876bae216..ba6c3a1ab0a24ec3e81f811fe6982a588a4a95d2 100644 (file)
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.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.
  *
  * 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/lib/poll-loop.h b/lib/poll-loop.h
index da8f6e2063959e0dc7f3c52930e7c2a3bc9d9247..e77d0275ed9e60191e8fe10f5a999da621c1e55f 100644 (file)
--- a/lib/poll-loop.h
+++ b/lib/poll-loop.h
@@ -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.
  *
  * 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/lib/process.c b/lib/process.c
index 3d6c11ae2018079d00096978d2b3b97df6b3b5a6..fcb869fbf5549e0e057dda4a259ed27599b82a45 100644 (file)
--- a/lib/process.c
+++ b/lib/process.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.
  *
  * 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/lib/process.h b/lib/process.h
index 9c4556b79a5f3cc4cd27977caf495eddd460d95e..f6777258547075ff1f9f008a1d7dbec040deaab0 100644 (file)
--- a/lib/process.h
+++ b/lib/process.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/random.c b/lib/random.c
index 911ebf30442ac72824b5ba6e689c1285c1ae9074..3ea65d59cadf967ab5854c04969055596b116440 100644 (file)
--- a/lib/random.c
+++ b/lib/random.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.
  *
  * 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/lib/random.h b/lib/random.h
index 5bb041e5e06a6a1189f1d9eea91aa3d868d79c13..eaac1437b3f0dd4b6a07f0a8bbbb9cf6aff8b488 100644 (file)
--- a/lib/random.h
+++ b/lib/random.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/rconn.c b/lib/rconn.c
index 700de11b277a91903fcf21f27d88067a945a614c..aa8b7e305a65d1825746654f87879a5d4e873224 100644 (file)
--- a/lib/rconn.c
+++ b/lib/rconn.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.
  *
  * 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/lib/rconn.h b/lib/rconn.h
index eea054f3739efe5939184d5e31e56a935d6b3973..23976409ebaa31924490985a2b7bc9313b61ee92 100644 (file)
--- a/lib/rconn.h
+++ b/lib/rconn.h
@@ -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.
  *
  * 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/lib/reconnect.c b/lib/reconnect.c
index 78ebda543ea42314ae0d42580d91924dd146975e..0333d9622c3e5b940a7e72f2226db972035de904 100644 (file)
--- a/lib/reconnect.c
+++ b/lib/reconnect.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/reconnect.h b/lib/reconnect.h
index 997a03f218d9806da0e07ca8a9e4e867fb757a32..e935d0af0afb5e1b6e15c843972b1b3b9cdf102f 100644 (file)
--- a/lib/reconnect.h
+++ b/lib/reconnect.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/route-table.c b/lib/route-table.c
index 8e54b2848983727e12511f23a065f9150460df36..63a09f2e8c3cf6e4c8c0429e0a44a4fe7284e231 100644 (file)
--- a/lib/route-table.c
+++ b/lib/route-table.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/route-table.h b/lib/route-table.h
index 534350c8ca5a83df6c72c3cf1007dd1e1ddfc5bb..1479249ca67b0e911867979e23532cc1baf95a02 100644 (file)
--- a/lib/route-table.h
+++ b/lib/route-table.h
@@ -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.
  *
  * 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/lib/rtnetlink-link.c b/lib/rtnetlink-link.c
index 07350a6c5a54f52be8b219018b236f0dad17c7dd..0b3710fb2d8735d1fa65c54f1fcd021ae15e8062 100644 (file)
--- a/lib/rtnetlink-link.c
+++ b/lib/rtnetlink-link.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/rtnetlink-link.h b/lib/rtnetlink-link.h
index 7c64c94daaad6181df3a2a7abbc96b2e31d01654..d0d9a7522bbd37aeb8da1010d60f1689bcc498e3 100644 (file)
--- a/lib/rtnetlink-link.h
+++ b/lib/rtnetlink-link.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/sat-math.h b/lib/sat-math.h
index cae956b5e9440b47ff59f2d140a7837512d34a77..ae504ba143b8e6fc1e1c763e81d937019617dd34 100644 (file)
--- a/lib/sat-math.h
+++ b/lib/sat-math.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * 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/lib/sha1.c b/lib/sha1.c
index 6205e500be93231d41c9563c01797113bd3a31ca..4f48ef21027e9d408f70fe5de5322111b3dc49e3 100644 (file)
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -1,7 +1,7 @@
 /*
  * This file is from the Apache Portable Runtime Library.
  * The full upstream copyright and license statement is included below.
 /*
  * This file is from the Apache Portable Runtime Library.
  * The full upstream copyright and license statement is included below.

- * Modifications copyright (c) 2009, 2010 Nicira Networks.
+ * Modifications copyright (c) 2009, 2010 Nicira, Inc.

  */
 
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 /* Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/lib/sha1.h b/lib/sha1.h
index 9015104f87eedd9dfad0deff1cf6b51f943bb388..eda265dfc566b028ab93f94b3d25c006fb1919ca 100644 (file)
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -1,7 +1,7 @@
 /*
  * This file is from the Apache Portable Runtime Library.
  * The full upstream copyright and license statement is included below.
 /*
  * This file is from the Apache Portable Runtime Library.
  * The full upstream copyright and license statement is included below.

- * Modifications copyright (c) 2009 Nicira Networks.
+ * Modifications copyright (c) 2009 Nicira, Inc.

  */
 
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  */
 
 /* Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/lib/shash.c b/lib/shash.c
index a325deca8423ded086e19ae63436a81fdcd9ab3b..af917b33c658c75c8dd7ec5e46333edec281b85a 100644 (file)
--- a/lib/shash.c
+++ b/lib/shash.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/shash.h b/lib/shash.h
index c7e3d14117b24c32b454409747e9a3ead247903e..decfcbc1f9fd3a332d9ac778170d26a012061aa8 100644 (file)
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/signals.c b/lib/signals.c
index 7650cb9b0dacdd5f5953c86cf05f4f8a8805f4a5..98fe23ebe4cefc0fd626d2083a95f486b974329f 100644 (file)
--- a/lib/signals.c
+++ b/lib/signals.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/signals.h b/lib/signals.h
index e09b04a0a27f0876c261ca97ef3eba9db2aa6d1e..ac96b0f83a93840347c21e2173321dcfc4f0d514 100644 (file)
--- a/lib/signals.h
+++ b/lib/signals.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/socket-util.c b/lib/socket-util.c
index a9b3b1adcaec1a1cc83a7ad09acb8ade31898a90..82a33c2077c9da0565e07fc4b1358f786af49d34 100644 (file)
--- a/lib/socket-util.c
+++ b/lib/socket-util.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.
  *
  * 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/lib/socket-util.h b/lib/socket-util.h
index 8ea40d5f96195f7d4bd2ca2dfeebf35a5f2bd25d..56c72cd3727d3e89916c068c699e75a1b9c07bd4 100644 (file)
--- a/lib/socket-util.h
+++ b/lib/socket-util.h
@@ -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.
  *
  * 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/lib/sort.c b/lib/sort.c
index 017b0a9a0744291a1e4cb4594f61c39235482195..ed40637e287e6dbbb42a822ad614d2db3c2443a2 100644 (file)
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/sort.h b/lib/sort.h
index c952f444e6a5ff0f302eb7ce61b1110dc690c58f..9887e8ffc592f5f4a3ca3d220de7e981439b431a 100644 (file)
--- a/lib/sort.h
+++ b/lib/sort.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/lib/sset.c b/lib/sset.c
index 9a0936b2d18938e715ea8e9e995f178b07a2fcca..ee4224a4fc73c83724e1a4ce9afed200f1f415d1 100644 (file)
--- a/lib/sset.c
+++ b/lib/sset.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.
  *
  * 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/lib/sset.h b/lib/sset.h
index a739fce00c75357e9f8d4563cac42c4698fb04a2..7f9e1250c919fa741b9eda0f9ac493069bb5068d 100644 (file)
--- a/lib/sset.h
+++ b/lib/sset.h
@@ -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.
  *
  * 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/lib/stp.c b/lib/stp.c
index e92305314ddad5faecf5c6b505df8bef712855aa..ee5c8bcde84527c4509d46231915e56d272eeb8a 100644 (file)
--- a/lib/stp.c
+++ b/lib/stp.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.
  *
  * 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/lib/stp.h b/lib/stp.h
index 8ce093e296c61ad5ea9505870cc8753417a24648..524b9dcf159ab3472b501a8281a2b85e7678d52f 100644 (file)
--- a/lib/stp.h
+++ b/lib/stp.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/stream-fd.c b/lib/stream-fd.c
index 4113e3fc1693c33fa521392c78d71b417b55538d..6b782ec295c55ffce636721c219d2a299c4b7844 100644 (file)
--- a/lib/stream-fd.c
+++ b/lib/stream-fd.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/stream-fd.h b/lib/stream-fd.h
index b42615fa64784cbd9cc41d784d1ac09d1298c414..8026953816b5cfb66eda869b581a96fc019fab90 100644 (file)
--- a/lib/stream-fd.h
+++ b/lib/stream-fd.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/stream-nossl.c b/lib/stream-nossl.c
index cdbbf5d7a7c604cf9cb9f90d2fa76100dc620101..23bc1fbdf29cbd5415393f7ceb8a170790137bf6 100644 (file)
--- a/lib/stream-nossl.c
+++ b/lib/stream-nossl.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.
  *
  * 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/lib/stream-provider.h b/lib/stream-provider.h
index 1eb7c94fdafb670fcfb5035902b1351655f725a4..712d2898182bc2b62283733524ca54f268baf612 100644 (file)
--- a/lib/stream-provider.h
+++ b/lib/stream-provider.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/stream-ssl.c b/lib/stream-ssl.c
index ad572d3523c7a77d337498ab14a620e6dfbde90f..f2d5037ad32718e18c0ed7e8289bdcf0fd5b1fd4 100644 (file)
--- a/lib/stream-ssl.c
+++ b/lib/stream-ssl.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.
  *
  * 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/lib/stream-ssl.h b/lib/stream-ssl.h
index 83b9ddba202bbbb7eab20a48d7a86d10764c0465..030f66225ba7883f81fffa89d3fcd6623e92583e 100644 (file)
--- a/lib/stream-ssl.h
+++ b/lib/stream-ssl.h
@@ -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.
  *
  * 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/lib/stream-tcp.c b/lib/stream-tcp.c
index 9762f88ed630b5c563f149572d6dfa724df7eee3..97492937bbb163093728255263f09ecdcae54e39 100644 (file)
--- a/lib/stream-tcp.c
+++ b/lib/stream-tcp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 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.
  *
  * 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/lib/stream-unix.c b/lib/stream-unix.c
index 40ef012486e70ee6242892284201d5dacd211b38..99a996238ee405eccbe4481ac7fcf8e9b85b2817 100644 (file)
--- a/lib/stream-unix.c
+++ b/lib/stream-unix.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.
  *
  * 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/lib/stream.c b/lib/stream.c
index eabace8a4ea72ad82fc54bc2657540ade09b99f4..271f16b93b650f664e4925f342d764d391a2c710 100644 (file)
--- a/lib/stream.c
+++ b/lib/stream.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.
  *
  * 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/lib/stream.h b/lib/stream.h
index bd3901747ba28bc75fdde7b1a4fb204c69a95e42..8ed0ff589327758e869501d48cedb8a4a8c2f968 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/stress.c b/lib/stress.c
index dfd0099090f82d04b139aecc1fd74d22d355d836..a14209ec7a2c14e6239f5f472a15f0fe155c7e65 100644 (file)
--- a/lib/stress.c
+++ b/lib/stress.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/stress.h b/lib/stress.h
index 9d6ea97f0793ae4d8e20c998621e8390bfec224f..498deefeeb09dc8447b4536e7b25c1d4d0e9f191 100644 (file)
--- a/lib/stress.h
+++ b/lib/stress.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/string.c b/lib/string.c
index f9ce788eff3f7fdc8e1976acef79e2d5046862b5..082359d858d87de746c844ae7bbafd8c78f18b5d 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2011 Nicira Networks.
+ * Copyright (c) 2009, 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.
  *
  * 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/lib/string.h b/lib/string.h
index 5e372bbc165f50f500e08f8d75a9675bf78ea351..2b7b454f61212beffd430effaf26fc799cb3c55b 100644 (file)
--- a/lib/string.h
+++ b/lib/string.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2011 Nicira Networks.
+ * Copyright (c) 2009, 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.
  *
  * 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/lib/svec.c b/lib/svec.c
index 03c3747275994096dead1439106cff34c19eb349..381ee324dce1b7ecf82247055a3825ac2b9084db 100644 (file)
--- a/lib/svec.c
+++ b/lib/svec.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.
  *
  * 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/lib/svec.h b/lib/svec.h
index 0ee058c1ea4ef0c0d6813d09e871b6baf4c166fc..341e26989801e5de54fcf2e26132bd08bcb190ee 100644 (file)
--- a/lib/svec.h
+++ b/lib/svec.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/table.c b/lib/table.c
index 8141677c3cfc5d21f95fc71db2740ba9b72e01a9..a8b35e216f484b64a85eb38e9cb28c29a9e2c063 100644 (file)
--- a/lib/table.c
+++ b/lib/table.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.
  *
  * 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/lib/table.h b/lib/table.h
index c29d7e31f0e1a4466be63439d3dcc6bfeb49583e..6c8f7631a103ece3e8b8869d6ddb602f99d0e406 100644 (file)
--- a/lib/table.h
+++ b/lib/table.h
@@ -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.
  *
  * 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/lib/tag.c b/lib/tag.c
index bf2c9a5bbe42853551560039bc8a8f43cf27642d..f064d17867f485900684ad013e495a4ab02d61ed 100644 (file)
--- a/lib/tag.c
+++ b/lib/tag.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.
  *
  * 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/lib/tag.h b/lib/tag.h
index 9cb581d23a834204b091fb044cd2f96ae12aacdc..2050de0b2febb93ed9ce3696bf1b1c1938a787bc 100644 (file)
--- a/lib/tag.h
+++ b/lib/tag.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/timer.c b/lib/timer.c
index 84d20a401d2b720ccdffea6268a27da75886ad25..e767db65ff97ff2aff23f45c5d0e1d22afa2e070 100644 (file)
--- a/lib/timer.c
+++ b/lib/timer.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.
  *
  * 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/lib/timer.h b/lib/timer.h
index be7bce2f4b9085eedf64837d8c2fa9b35ffe81fe..e9650ada9b46f07ff0e0595c562b202a4252c4de 100644 (file)
--- a/lib/timer.h
+++ b/lib/timer.h
@@ -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.
  *
  * 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/lib/timeval.c b/lib/timeval.c
index b60ece9e3b46e5b6efa14bd8b77e8ed6780a8370..d29b66187c79789441e8879e2565b23c74014c4d 100644 (file)
--- a/lib/timeval.c
+++ b/lib/timeval.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.
  *
  * 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/lib/timeval.h b/lib/timeval.h
index e9ff183249180cbc636dc8d95037a4f5b7396d25..e8413ff25ca64caad18c3b9aa140ea3a9207e76c 100644 (file)
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -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.
  *
  * 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/lib/type-props.h b/lib/type-props.h
index 5c75d9f3acd3314cd134a3eabe0bb267c8b8590b..8c83ea6fc37d6c77e41555f7c79c409b542fbcc7 100644 (file)
--- a/lib/type-props.h
+++ b/lib/type-props.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2011 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/unaligned.h b/lib/unaligned.h
index 87b060cf916f118011d77b4f253d8bd0839595fe..2654a2763fd5494575b0243e0431d461d5f5bac7 100644 (file)
--- a/lib/unaligned.h
+++ b/lib/unaligned.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/lib/unicode.c b/lib/unicode.c
index e8fea8663f3dba5ff1be8ee675ed5c4495705e2b..31612a25c74604999d3ef316d30931271a14f970 100644 (file)
--- a/lib/unicode.c
+++ b/lib/unicode.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/unicode.h b/lib/unicode.h
index b2078e6dce0ad33a6535c2f14d56099c1628bbfe..f5139ec10f4c52c075dfd50747fb03b8b8e9f4a9 100644 (file)
--- a/lib/unicode.h
+++ b/lib/unicode.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/unixctl.c b/lib/unixctl.c
index b495deb80514c81a1a405b49e9da0bbbbeaba7c6..4ab493d48775ea0504b57d4f4233b52c7f3483a9 100644 (file)
--- a/lib/unixctl.c
+++ b/lib/unixctl.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.
  *
  * 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/lib/unixctl.h b/lib/unixctl.h
index 13a8096e80ee55e606f560b7cbfcbd1130f66bc7..ce43893c6a7d3305573d560ba9590d493397de02 100644 (file)
--- a/lib/unixctl.h
+++ b/lib/unixctl.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/lib/util.c b/lib/util.c
index f9880f351ff8ca14870ca5589fd2fb7f9e18ca4e..de3cf3cb0efe724fbad7699f4357804d5248038e 100644 (file)
--- a/lib/util.c
+++ b/lib/util.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.
  *
  * 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/lib/util.h b/lib/util.h
index e5d1c3adccd453c1e3c6054b449f347544c36837..1bdaeee563ba5a9d0bf2b1275a5e6d63dbdb36e5 100644 (file)
--- a/lib/util.h
+++ b/lib/util.h
@@ -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.
  *
  * 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/lib/uuid.c b/lib/uuid.c
index 8b02bf556a5b80127084657984b0e69952f4472b..cfaf0c5825ffe91df2143730483ce1eb40f4a1e7 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/uuid.h b/lib/uuid.h
index e62e8fe76fc68e2d19d4e060d54ea7de4df37c06..37e01d091158f54f0bc74322254498fe400648d0 100644 (file)
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010 Nicira Networks
+/* Copyright (c) 2008, 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.
  *
  * 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/lib/valgrind.h b/lib/valgrind.h
index 48c95b465f8ff7202b0e98013700c91c1dc7a950..1c11e57d7e9bf2c131458f36934ad447af4aa6a4 100644 (file)
--- a/lib/valgrind.h
+++ b/lib/valgrind.h
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/lib/vconn-provider.h b/lib/vconn-provider.h
index d6da5f092795f0f46a4bee616dda65bf619824f6..2940852479b3a7b1b229c053fed998f305988987 100644 (file)
--- a/lib/vconn-provider.h
+++ b/lib/vconn-provider.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/lib/vconn-stream.c b/lib/vconn-stream.c
index 03e588185bf8cad7f0777714e0c2371206e8118d..d707e063c302364bd33305e8946b9c9881ee90e9 100644 (file)
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.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.
  *
  * 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/lib/vconn.c b/lib/vconn.c
index 4d04c8338243bb3dcc19895a50abb4a98bb03ae4..5cd708d246d250eaa29715512a565f1961354583 100644 (file)
--- a/lib/vconn.c
+++ b/lib/vconn.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.
  *
  * 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/lib/vconn.h b/lib/vconn.h
index 59713275edb56314ee11f1b8068107001d86da9d..ee4a5681449c132dd960d4192eae456f6b632caa 100644 (file)
--- a/lib/vconn.h
+++ b/lib/vconn.h
@@ -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.
  *
  * 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/lib/vlan-bitmap.c b/lib/vlan-bitmap.c
index 4c5c1eb68870d0405505aa23d5f2caf959519dca..9c205a2095e69d856db1907efc56c1733a06cfce 100644 (file)
--- a/lib/vlan-bitmap.c
+++ b/lib/vlan-bitmap.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/vlan-bitmap.h b/lib/vlan-bitmap.h
index fed0ba197ab74cb69748f8b9e8d10c24eafefc5e..3e2e82062dc2e099f026c75afec9e3596d786450 100644 (file)
--- a/lib/vlan-bitmap.h
+++ b/lib/vlan-bitmap.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/lib/vlandev.c b/lib/vlandev.c
index 736b779479db5b1cfe6dbb87d253e14536b5910e..77e8e9320bd8c56ce462b1472d9b8b389ec58b71 100644 (file)
--- a/lib/vlandev.c
+++ b/lib/vlandev.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.
  *
  * 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/lib/vlandev.h b/lib/vlandev.h
index cba0fa41223708abb6d901ea2a3b3054ba595a8b..ab74ecdd587200de886c19470f035fac27976524 100644 (file)
--- a/lib/vlandev.h
+++ b/lib/vlandev.h
@@ -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.
  *
  * 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/lib/vlog.c b/lib/vlog.c
index 4c97ef40b39bfdc613513cce37befb43915475bf..a7d9e48b9ddd9d7fef59c7854b946191f28910b8 100644 (file)
--- a/lib/vlog.c
+++ b/lib/vlog.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.
  *
  * 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/lib/vlog.h b/lib/vlog.h
index 5954d217a413424d05dcb54c166902ebe34efab0..2dce3c62b87b4153407af89514282eaaeaa8b6b7 100644 (file)
--- a/lib/vlog.h
+++ b/lib/vlog.h
@@ -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.
  *
  * 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/m4/openvswitch.m4 b/m4/openvswitch.m4
index d4f8fa62b8d62c33771dc11ce4928afce63cd27f..dca9f5fe716f8111b4f6dc0c8c809746fa68b0c0 100644 (file)
--- a/m4/openvswitch.m4
+++ b/m4/openvswitch.m4
@@ -1,6 +1,6 @@
 # -*- autoconf -*-
 
 # -*- autoconf -*-
 

-# 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.
 #
 # 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/ofproto/automake.mk b/ofproto/automake.mk
index 6d98de73636068d402681cbbaf30fb31654f46c0..ab889af17555ad35eed8329c4d8fd0a95a871682 100644 (file)
--- a/ofproto/automake.mk
+++ b/ofproto/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/ofproto/collectors.c b/ofproto/collectors.c
index 158b26dcf33265e85c4c539caad7c42d8f79d6ee..14572db9c73c686869c5894770a58e73e570f40f 100644 (file)
--- a/ofproto/collectors.c
+++ b/ofproto/collectors.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.
  *
  * 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/ofproto/collectors.h b/ofproto/collectors.h
index 47b148ba44ef1f09a1a22ea5c600e87179a75c3e..6529b8de5db43b7dc2db382e85951b38c90206e2 100644 (file)
--- a/ofproto/collectors.h
+++ b/ofproto/collectors.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2011 Nicira Networks.
+ * Copyright (c) 2009, 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.
  *
  * 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/ofproto/connmgr.c b/ofproto/connmgr.c
index dea267da237009830fc5662afd822f20db70e758..e80d20cc97308816bd81bff48508beda3f800372 100644 (file)
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.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.
  *
  * 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/ofproto/connmgr.h b/ofproto/connmgr.h
index 81ca51b79b4da6955d3ff89be2ff8fc99aba8f70..8ac0b8dc6d251d003ea03f4136d2d76483b3f234 100644 (file)
--- a/ofproto/connmgr.h
+++ b/ofproto/connmgr.h
@@ -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.
  *
  * 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/ofproto/fail-open.c b/ofproto/fail-open.c
index edc939772f4f42e92fa96a5d4c2ea4a11b16d359..99bbccd3178f88a1b66fb5bf1043b4bd9bb9b190 100644 (file)
--- a/ofproto/fail-open.c
+++ b/ofproto/fail-open.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.
  *
  * 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/ofproto/fail-open.h b/ofproto/fail-open.h
index 51fa0b96a191170bf73f8f1d43535dce0a0eea73..4e91ea01d0db8775aa47ad1f9d040e73d4d4193c 100644 (file)
--- a/ofproto/fail-open.h
+++ b/ofproto/fail-open.h
@@ -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.
  *
  * 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/ofproto/in-band.c b/ofproto/in-band.c
index f73899823e387c948d06223306070e1365a34b95..2013869c5a131aa00b9d825118e46d564910dc33 100644 (file)
--- a/ofproto/in-band.c
+++ b/ofproto/in-band.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.
  *
  * 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/ofproto/in-band.h b/ofproto/in-band.h
index 9de72ee6406495f1bc7f65825f9ace59013afcd5..7b610cbb3f7d11ea5fa3dfcdd2fe7d9e09da8aa1 100644 (file)
--- a/ofproto/in-band.h
+++ b/ofproto/in-band.h
@@ -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.
  *
  * 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/ofproto/names.c b/ofproto/names.c
index 724b1840e9423f1f5cdf804d91668e4e654b5cab..6dac9a0dadecac061e45cd79dba0d4c5e33f77ef 100644 (file)
--- a/ofproto/names.c
+++ b/ofproto/names.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.
  *
  * 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/ofproto/netflow.c b/ofproto/netflow.c
index 994f928679f09041fd9578889c0c4be91f06f421..aec39685af58f0235c56de10821e6c7cbbe56edf 100644 (file)
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.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.
  *
  * 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/ofproto/netflow.h b/ofproto/netflow.h
index 2c57f2f46246b082346ae86e457e0f9e2003c62d..c01ff15748763239c7a3468011dbe470e535b51f 100644 (file)
--- a/ofproto/netflow.h
+++ b/ofproto/netflow.h
@@ -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.
  *
  * 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/ofproto/ofproto-dpif-governor.c b/ofproto/ofproto-dpif-governor.c
index 3b15c38eb71a70790de13df90fe71f1de2f01ba1..7e3ecfae16a33d70b46dded3cbefca03f61aad7d 100644 (file)
--- a/ofproto/ofproto-dpif-governor.c
+++ b/ofproto/ofproto-dpif-governor.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/ofproto/ofproto-dpif-governor.h b/ofproto/ofproto-dpif-governor.h
index ad022d5e82c77b26d036bda727e79cbe8758f2b1..31cf4a21d9e397de93c21cacfada7a273d10e0a3 100644 (file)
--- a/ofproto/ofproto-dpif-governor.h
+++ b/ofproto/ofproto-dpif-governor.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
index 73da2af6a323fe39711cc92c5092fc2f4d234afe..fb09b2f52e1de4b5fd08a719ff8f6aacb7013954 100644 (file)
--- a/ofproto/ofproto-dpif-sflow.c
+++ b/ofproto/ofproto-dpif-sflow.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.

  * Copyright (c) 2009 InMon Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Copyright (c) 2009 InMon Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ofproto/ofproto-dpif-sflow.h b/ofproto/ofproto-dpif-sflow.h
index 0b6c1b48972a33fe32c2470b4477d72c97ceee2c..8d388d07129feeb3889b105215a05a931fc358ee 100644 (file)
--- a/ofproto/ofproto-dpif-sflow.h
+++ b/ofproto/ofproto-dpif-sflow.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009, 2010 InMon Corp.
 /*
  * Copyright (c) 2009, 2010 InMon Corp.

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 1c5d331259198a4e39eaebf11afb5478fe6a7a84..365be93b33a1e8cb2cfa823d007e0ebc6b38e2c8 100644 (file)
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.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.
  *
  * 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/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index 7b0e478bf983194bca3acc1c31da3d7feb2164e7..c28a95fca235ac74112abdd03fc6c3127594c4b8 100644 (file)
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -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.
  *
  * 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/ofproto/ofproto.c b/ofproto/ofproto.c
index 6ef2a5d723360c77d27a71d97c2600924d116087..4b2cbc90fa1f317f04a33a12199ae5f444a9589f 100644 (file)
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.

  * Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Copyright (c) 2010 Jean Tourrilhes - HP-Labs.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h
index c40f5d3a419cf80c5def70735f72a068c88c1bf9..c8d98578e8876c837a9914a5e0c23496d49f152b 100644 (file)
--- a/ofproto/ofproto.h
+++ b/ofproto/ofproto.h
@@ -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.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -131,7 +131,7 @@ struct ofproto_controller {
     uint8_t dscp;               /* DSCP value for controller connection. */
 };
 
     uint8_t dscp;               /* DSCP value for controller connection. */
 };
 

-#define DEFAULT_MFR_DESC "Nicira Networks, Inc."
+#define DEFAULT_MFR_DESC "Nicira, Inc."

 #define DEFAULT_HW_DESC "Open vSwitch"
 #define DEFAULT_SW_DESC VERSION
 #define DEFAULT_SERIAL_DESC "None"
 #define DEFAULT_HW_DESC "Open vSwitch"
 #define DEFAULT_SW_DESC VERSION
 #define DEFAULT_SERIAL_DESC "None"

diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c
index 6d7eb1301ca7c5000bd2771571e6df72c758624e..9053ea26718b593fba959393754971420969ed70 100644 (file)
--- a/ofproto/pinsched.c
+++ b/ofproto/pinsched.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.
  *
  * 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/ofproto/pinsched.h b/ofproto/pinsched.h
index 642ca30f922bdbbe386bde4a172bd6a506e3d120..26a4d7a3a62985cac5b81021ab341bc17be9b757 100644 (file)
--- a/ofproto/pinsched.h
+++ b/ofproto/pinsched.h
@@ -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.
  *
  * 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/ofproto/pktbuf.c b/ofproto/pktbuf.c
index 23c01e0326c6e3da01ce075da79e03bb60dfe002..acc0d34d304c308689a11d899a95d7fb24be3374 100644 (file)
--- a/ofproto/pktbuf.c
+++ b/ofproto/pktbuf.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.
  *
  * 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/ofproto/pktbuf.h b/ofproto/pktbuf.h
index e29117ab6f2232277b328b70a93805483e96f84d..990f2ea0619bc284d5b7ee7e9d7d874316559f2a 100644 (file)
--- a/ofproto/pktbuf.h
+++ b/ofproto/pktbuf.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/ovsdb/column.c b/ovsdb/column.c
index 576e4638775e17c199c23e66ae185b881bb218b6..26b7a0b372e2b0d86e8ad41826baec49f8caf9aa 100644 (file)
--- a/ovsdb/column.c
+++ b/ovsdb/column.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/column.h b/ovsdb/column.h
index 429818aa17acebbf36062a863ab918128da6a311..60ba478af9f42cf02b0e5bef2ab917393269aa7a 100644 (file)
--- a/ovsdb/column.h
+++ b/ovsdb/column.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/condition.c b/ovsdb/condition.c
index c57e419785c393c28aceee21cb2232b3ca7dde18..760dd13bc165b20bbe9a3619a9477fcd7b4d4415 100644 (file)
--- a/ovsdb/condition.c
+++ b/ovsdb/condition.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/condition.h b/ovsdb/condition.h
index 4716150e445575e419217a3a93f8d558b9c2da2f..ae6159c06ae8623cb84447624d2c44176aa45114 100644 (file)
--- a/ovsdb/condition.h
+++ b/ovsdb/condition.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/ovsdb/dot2pic b/ovsdb/dot2pic
index 52de5e821ed7cd3b666fc31cb64fba1b6f4ff224..7b0ec36b3ab8e18f0fa262cd20af9191faddc837 100755 (executable)
--- a/ovsdb/dot2pic
+++ b/ovsdb/dot2pic
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
 #! /usr/bin/perl
 

-# Copyright (c) 2009, 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/ovsdb/execution.c b/ovsdb/execution.c
index 675c1c31a7ca603cff1c983d11c0550b73aa7e2f..1aff0c51eaca917d2c2d8cc86b7c629050bed06e 100644 (file)
--- a/ovsdb/execution.c
+++ b/ovsdb/execution.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/file.c b/ovsdb/file.c
index 05a4067a5759382276ee0f28d5ee5b83d799912e..c51f75290040d817076ab7289bb443db0231a730 100644 (file)
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/file.h b/ovsdb/file.h
index 19d51c01a9aa52f375f28cd48bd396b77d84a123..5d76a73ac02a9717e4544ee0d857dde068484ef6 100644 (file)
--- a/ovsdb/file.h
+++ b/ovsdb/file.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 88656b9656f0f62a8a6a59101275755235d5f36a..0cc8bdf9fa717bc32a4b28c6fba43d1272f99392 100644 (file)
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/ovsdb/jsonrpc-server.h b/ovsdb/jsonrpc-server.h
index 344ed9da20699d39335c8e8a2af0e1295a9daa83..8312a002c4ce7d3b23c4fea7ab9aef5827a3e6a8 100644 (file)
--- a/ovsdb/jsonrpc-server.h
+++ b/ovsdb/jsonrpc-server.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/log.c b/ovsdb/log.c
index f0926c0e6d976c138ffe3b16867323f7e47514a4..ab4a150ca6beacd00297c54bf97e6d3f4c76817e 100644 (file)
--- a/ovsdb/log.c
+++ b/ovsdb/log.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/log.h b/ovsdb/log.h
index f48dc76bdad27a6c4824808808ebfddad78297b7..aad2543539f91abbc912de2ddeff28a700e3c57f 100644 (file)
--- a/ovsdb/log.h
+++ b/ovsdb/log.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/mutation.c b/ovsdb/mutation.c
index 7ae83feef08f7cf060a08a6c64c01a3faa5b565d..0dcd16fec9b54b38d04be7439fcdac887f918752 100644 (file)
--- a/ovsdb/mutation.c
+++ b/ovsdb/mutation.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/mutation.h b/ovsdb/mutation.h
index 86de6f2466c8df7cac8f2e5e2fc9e54b5a21f291..a6545e4954a3dc5fcd8406af23173a1785e712f4 100644 (file)
--- a/ovsdb/mutation.h
+++ b/ovsdb/mutation.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
index 077e3a8cc31536ddc19a2bcc46613a2d7a6228f0..a94d7cbc77b090d41857b4a109482980a218c34e 100644 (file)
--- a/ovsdb/ovsdb-client.c
+++ b/ovsdb/ovsdb-client.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.
  *
  * 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/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index d8363a2cbd2c5b2d80f3d71728e15344b033ebe8..28bf901eb0bf07ef4725ee2cd73c51dfb2744f4c 100644 (file)
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index e83b49a129f24f7c41c61e4fd21ff31c6b155654..f680989677617ff9d263137c42225f3d7a19c0a0 100644 (file)
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.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.
  *
  * 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/ovsdb/ovsdb.c b/ovsdb/ovsdb.c
index fb020c9f2f4fd8b36eeec736d8aec7ee11ba6514..584433c7f7df5182e94fd4d74cc628e73ce7be45 100644 (file)
--- a/ovsdb/ovsdb.c
+++ b/ovsdb/ovsdb.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/ovsdb.h b/ovsdb/ovsdb.h
index 0d15ef2db2488c8dd8146b4bfb8f0621f8eb74ad..ea7a9c2df6378d405e054438ef7467b9d6b0e529 100644 (file)
--- a/ovsdb/ovsdb.h
+++ b/ovsdb/ovsdb.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/ovsdbmonitor/OVEConfig.py b/ovsdb/ovsdbmonitor/OVEConfig.py
index 4754c67af5454878394ce4b7b17ea2d738437a93..9520ae753feb61723503fde09b5589bfcafe9dfa 100644 (file)
--- a/ovsdb/ovsdbmonitor/OVEConfig.py
+++ b/ovsdb/ovsdbmonitor/OVEConfig.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Nicira Networks.
+# Copyright (c) 2011 Nicira, Inc.

 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ovsdb/ovsdbmonitor/OVEFetch.py b/ovsdb/ovsdbmonitor/OVEFetch.py
index 8bc5757c5930aaba4f45b3eef5da75d837630b3d..0beafe7da029cee455b8ee0a10ade984c270f7e3 100644 (file)
--- a/ovsdb/ovsdbmonitor/OVEFetch.py
+++ b/ovsdb/ovsdbmonitor/OVEFetch.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Nicira Networks.
+# Copyright (c) 2011 Nicira, Inc.

 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ovsdb/ovsdbmonitor/OVEFlowWindow.py b/ovsdb/ovsdbmonitor/OVEFlowWindow.py
index e5a29a9f05d87928eac0128b725e6c8cab4c2cd7..caf6533e95f806e57fc83530efd9482d392115d4 100644 (file)
--- a/ovsdb/ovsdbmonitor/OVEFlowWindow.py
+++ b/ovsdb/ovsdbmonitor/OVEFlowWindow.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Nicira Networks.
+# Copyright (c) 2011 Nicira, Inc.

 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ovsdb/ovsdbmonitor/OVEStandard.py b/ovsdb/ovsdbmonitor/OVEStandard.py
index 23b3e66588faa8852076d25bdfc601edfb7685a3..c55a881c67e55c7073714bdb9b0669e0acfb5544 100644 (file)
--- a/ovsdb/ovsdbmonitor/OVEStandard.py
+++ b/ovsdb/ovsdbmonitor/OVEStandard.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Nicira Networks.
+# Copyright (c) 2011 Nicira, Inc.

 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ovsdb/ovsdbmonitor/OVEUtil.py b/ovsdb/ovsdbmonitor/OVEUtil.py
index 774bed272c943c4c0b5022bbec9ff7c560642fbb..d1b0692642896984bdba62be7270bfb6fc14ca4a 100644 (file)
--- a/ovsdb/ovsdbmonitor/OVEUtil.py
+++ b/ovsdb/ovsdbmonitor/OVEUtil.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Nicira Networks.
+# Copyright (c) 2011 Nicira, Inc.

 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # Copyright (c) 2010 Citrix Systems, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ovsdb/query.c b/ovsdb/query.c
index 52eda0a7cfbd4e1348e8ef8ebe72cbac9ec476e0..7f6eccd7d60d9fb3e9b9b96f4fec55a51a204ef6 100644 (file)
--- a/ovsdb/query.c
+++ b/ovsdb/query.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/ovsdb/query.h b/ovsdb/query.h
index f5cfe2e64ca98d2c2d04caeba77420e4b97e02ff..5cc9b11da763ad7c18bdf8e435560c92d14a6f97 100644 (file)
--- a/ovsdb/query.h
+++ b/ovsdb/query.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/row.c b/ovsdb/row.c
index e25f857aeed85b43a3aa21fb30e7aca0dd27a6c4..457869b38cdbdade316885bb4c9bcdcec9bed501 100644 (file)
--- a/ovsdb/row.c
+++ b/ovsdb/row.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/row.h b/ovsdb/row.h
index 306a56da650ef3b6659df4796f2a03b206a1eacc..45c7fb397b015e99f423d702fc77064772eabb4a 100644 (file)
--- a/ovsdb/row.h
+++ b/ovsdb/row.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/ovsdb/server.c b/ovsdb/server.c
index e3ba1498ef3fa1988f5165ea5723dccf300b0619..7cd42638ca4f8d1bcfa365f4b76b99ad100f8e00 100644 (file)
--- a/ovsdb/server.c
+++ b/ovsdb/server.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/ovsdb/server.h b/ovsdb/server.h
index 17e4222195f9ab6cbcc6825d54e44a7b805d9759..e0738500f7e14c6cc3b2e9fdec3fe76eb8e7f7e9 100644 (file)
--- a/ovsdb/server.h
+++ b/ovsdb/server.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2012 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/table.c b/ovsdb/table.c
index e350fc3017851e24ba331db9eb1d506eb32973fb..19f4d31733bb21c5f494943eeebbc9265628df56 100644 (file)
--- a/ovsdb/table.c
+++ b/ovsdb/table.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/table.h b/ovsdb/table.h
index a2f2aa84e39154a1b49fb16ba7c8c235776a499a..fab9c5b6378dbc1415def951a19699a43186c64b 100644 (file)
--- a/ovsdb/table.h
+++ b/ovsdb/table.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/transaction.c b/ovsdb/transaction.c
index 08a8bc111eba4ef5311ec049548d82e52551266b..e785e216d23071fb6d87fea2b5e2cf65a1b9381c 100644 (file)
--- a/ovsdb/transaction.c
+++ b/ovsdb/transaction.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/transaction.h b/ovsdb/transaction.h
index 1d03ebdafa762c99ff36de8bc57b280f7143d2eb..edc91185f44f9b702b09ed77af1a0ab67b392e5b 100644 (file)
--- a/ovsdb/transaction.h
+++ b/ovsdb/transaction.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/ovsdb/trigger.c b/ovsdb/trigger.c
index 1322a2fd4ef9ec12a3992426d373d0fc606d2598..6ae1f516b5754b89212607352a223714727dedd9 100644 (file)
--- a/ovsdb/trigger.c
+++ b/ovsdb/trigger.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, 2011 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/ovsdb/trigger.h b/ovsdb/trigger.h
index 78265e5cadf0fb9c42293f0df135e8a3ae6817d7..1d47f3f09b62d89d024a250287fea5fb30b80035 100644 (file)
--- a/ovsdb/trigger.h
+++ b/ovsdb/trigger.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011 Nicira Networks
+/* Copyright (c) 2009, 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.
  *
  * 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/python/ovs/daemon.py b/python/ovs/daemon.py
index 0d119f202588abf290006f6dbb8aeea0606de28a..650d2504034b6cced33c0e3d6f0f4e90861ff4f0 100644 (file)
--- a/python/ovs/daemon.py
+++ b/python/ovs/daemon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/db/data.py b/python/ovs/db/data.py
index 3cc4619cab82037b7834dfaf050acb588fdf373b..55e7a732b33bdeeae3f41085072ae31e37c7a901 100644 (file)
--- a/python/ovs/db/data.py
+++ b/python/ovs/db/data.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/db/error.py b/python/ovs/db/error.py
index c3fd3020a8499f3d6a452b1ffe22ca6795c79cb6..d9217e411e71e598518d72f9dc053d19298fdc20 100644 (file)
--- a/python/ovs/db/error.py
+++ b/python/ovs/db/error.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/db/idl.py b/python/ovs/db/idl.py
index 36a7bab285efa06063def07b4327c0ecda240ece..e4b98e8b47cf6fbbd236d9845fb326b16a46c088 100644 (file)
--- a/python/ovs/db/idl.py
+++ b/python/ovs/db/idl.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/db/parser.py b/python/ovs/db/parser.py
index cb7fc87d2982d1c07f775908c68d8ec81741a8ee..2556becce10e154892d3b36caf41e99a5e201c36 100644 (file)
--- a/python/ovs/db/parser.py
+++ b/python/ovs/db/parser.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/db/schema.py b/python/ovs/db/schema.py
index 12b997d1bef0eec597ab16d52300c11eb64c3b55..1b5a771f771538a75f3d78b75e7bd8a56b3349c6 100644 (file)
--- a/python/ovs/db/schema.py
+++ b/python/ovs/db/schema.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/db/types.py b/python/ovs/db/types.py
index fc9fc0a231d8a463a48f5c2d3b3d18d038e6d05d..96cdae820d200a017266f959effa37456b6dd5ed 100644 (file)
--- a/python/ovs/db/types.py
+++ b/python/ovs/db/types.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/fatal_signal.py b/python/ovs/fatal_signal.py
index dd989a09740ab81ab28befce4dbc5055681992be..e6fe78386ed455fb87715e103aefcbb2db4288c3 100644 (file)
--- a/python/ovs/fatal_signal.py
+++ b/python/ovs/fatal_signal.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/json.py b/python/ovs/json.py
index fa5fd154840f4910cddb16da801e073c24ae5092..d329ee41004c456fc9ea7bd0860f243fcc32f00d 100644 (file)
--- a/python/ovs/json.py
+++ b/python/ovs/json.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index b72af77cfcc6e5c95d88ff33726f22731c9107f5..cf08131327b77bd316e6cb462f90f8beb6581ce7 100644 (file)
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/ovsuuid.py b/python/ovs/ovsuuid.py
index 31c9bccd571abab8bc01748b30e2400e2856e72c..56fdad05ee55ade305cc026167557a62ffaa053c 100644 (file)
--- a/python/ovs/ovsuuid.py
+++ b/python/ovs/ovsuuid.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/poller.py b/python/ovs/poller.py
index 8d52d32b2ffd15a4a942311a25a8e14879c10c6f..e459c5823e9cd5ec7f79cffa3351fc1a0c4a222b 100644 (file)
--- a/python/ovs/poller.py
+++ b/python/ovs/poller.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/process.py b/python/ovs/process.py
index 4e6d44095f63be83c178438104f51984bc6f6a8c..d7561310cad12892213b2e54aa7a4c4bc80b6c42 100644 (file)
--- a/python/ovs/process.py
+++ b/python/ovs/process.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/reconnect.py b/python/ovs/reconnect.py
index f1da930a7d4dd36e7e4d32d36c3c71040c4a733b..459957302fa8b2ac57adef901cea37db53e7c280 100644 (file)
--- a/python/ovs/reconnect.py
+++ b/python/ovs/reconnect.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/socket_util.py b/python/ovs/socket_util.py
index d00d3989b699c07f791417c61f9e7245942f6133..a8e8d92e7d6ed5cfde4136fa0b777890efb94601 100644 (file)
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2012 Nicira Networks
+# Copyright (c) 2010, 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.
 #
 # 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/python/ovs/stream.py b/python/ovs/stream.py
index e2adaa5b0faa4c94394294454d13263aab7d9f83..82ea0c126c51ba462dd7f70b7f20a8ab2574e2db 100644 (file)
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/timeval.py b/python/ovs/timeval.py
index 71160798d6269eabc27f55cae2bba2f6e0e78ec0..ba0e54e931eca7414071990655cb0b99f33fea15 100644 (file)
--- a/python/ovs/timeval.py
+++ b/python/ovs/timeval.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/unixctl.py b/python/ovs/unixctl.py
index 396d1be4b64c649a52c52fec52dd65608a821232..0fadaeb6a8861e1eaac64978561d960c5d8a97a7 100644 (file)
--- a/python/ovs/unixctl.py
+++ b/python/ovs/unixctl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovs/util.py b/python/ovs/util.py
index 66e429b2c2c469c29a7a3c9176c2da69a9f992c5..cb0574bfcab5adac893684dec50b8239dfa2567a 100644 (file)
--- a/python/ovs/util.py
+++ b/python/ovs/util.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/python/ovs/vlog.py b/python/ovs/vlog.py
index ad53781170de15fa1d03dc42ebc2b1e06faaaadb..b585591b61212274d6eb73486432823ef65f1285 100644 (file)
--- a/python/ovs/vlog.py
+++ b/python/ovs/vlog.py
@@ -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.
 #
 # 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/python/ovstest/args.py b/python/ovstest/args.py
index 3f8d0d98b3f64f20d7f609b37f31bce9d9ea8ffc..8e23a894603f7e5cf5527d5cc14b5e423f55009b 100644 (file)
--- a/python/ovstest/args.py
+++ b/python/ovstest/args.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovstest/rpcserver.py b/python/ovstest/rpcserver.py
index 0f680e1551ee1a88e2f39ea6c66fa56e4464be6a..82bec3badce0dc6a239ceacce7b501a74204062c 100644 (file)
--- a/python/ovstest/rpcserver.py
+++ b/python/ovstest/rpcserver.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovstest/tcp.py b/python/ovstest/tcp.py
index 8413343f6f8c1e234147bb157a52ac6a49c3b8d3..d1304c363ac139ae6a30c1c441b9baf5eedd5cc9 100644 (file)
--- a/python/ovstest/tcp.py
+++ b/python/ovstest/tcp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovstest/udp.py b/python/ovstest/udp.py
index f34ae86038ee60cbdd0a6c3794866e27a57beaf7..fa03e74dbfd348ddfdf73f0c054b52084cb13d21 100644 (file)
--- a/python/ovstest/udp.py
+++ b/python/ovstest/udp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovstest/util.py b/python/ovstest/util.py
index 7bc77955d4ec1d8ff69775e4a5b7143aa958eefc..ee2a87867af3b66b83cecbc99f01592389b87fca 100644 (file)
--- a/python/ovstest/util.py
+++ b/python/ovstest/util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/python/ovstest/vswitch.py b/python/ovstest/vswitch.py
index 1d677be8dc2de9526b2e5d61e5b4324a46187f2e..dd315e5cae012cbf719a7bb16b2d4ae41f5cd88e 100644 (file)
--- a/python/ovstest/vswitch.py
+++ b/python/ovstest/vswitch.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/rhel/automake.mk b/rhel/automake.mk
index 87c4552c854be12785ff66b8fd9d0f158f764270..4c1d7821a41a1bb15770298c52e366177648c900 100644 (file)
--- a/rhel/automake.mk
+++ b/rhel/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index 9f1506c38697469b96ec81d5d6313e96de287706..6642f280d06cc87f686bfa7a5b5e63c777b8d55a 100755 (executable)
--- a/rhel/etc_init.d_openvswitch
+++ b/rhel/etc_init.d_openvswitch
@@ -5,7 +5,7 @@
 # chkconfig: 2345 09 91
 # description: Manage Open vSwitch kernel modules and user-space daemons
 
 # chkconfig: 2345 09 91
 # description: Manage Open vSwitch kernel modules and user-space daemons
 

-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 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.
 #
 # 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/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch
index 1a08fa92877e2b45bb1c57e08e322c2cb5b9ab1e..2fdd6c465dcf2c46043ded1d3c50a1a9fac20797 100644 (file)
--- a/rhel/etc_logrotate.d_openvswitch
+++ b/rhel/etc_logrotate.d_openvswitch
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/rhel/openvswitch-kmod-rhel5.spec.in b/rhel/openvswitch-kmod-rhel5.spec.in
index 4052cdd9b4d76b7570ad81ed44ce10cbc71b293d..ae73ea6ce8fbb78c763bae0b76a70754a89df269 100644 (file)
--- a/rhel/openvswitch-kmod-rhel5.spec.in
+++ b/rhel/openvswitch-kmod-rhel5.spec.in
@@ -1,7 +1,7 @@
 # Spec file for Open vSwitch kernel modules on Red Hat Enterprise
 # Linux 5.
 
 # Spec file for Open vSwitch kernel modules on Red Hat Enterprise
 # Linux 5.
 

-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in
index d165515ea038b53830cc7f1887c30ee687995dc2..d9aeff03ce2e7f831eee6cbbb21991aee21a8b11 100644 (file)
--- a/rhel/openvswitch-kmod-rhel6.spec.in
+++ b/rhel/openvswitch-kmod-rhel6.spec.in
@@ -1,7 +1,7 @@
 # Spec file for Open vSwitch kernel modules on Red Hat Enterprise
 # Linux 6.
 
 # Spec file for Open vSwitch kernel modules on Red Hat Enterprise
 # Linux 6.
 

-# Copyright (C) 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index 00d1aa754e34e321a8b030b6bae579a2ffc2b1d3..12045cb3bc1d11b1c4071b1b69d0e5411c77aa18 100644 (file)
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -1,6 +1,6 @@
 # Spec file for Open vSwitch on Red Hat Enterprise Linux.
 
 # Spec file for Open vSwitch on Red Hat Enterprise Linux.
 

-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright


@@ -11,7 +11,7 @@ Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
 Summary: Open vSwitch daemon/database/utilities
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/

-Vendor: Nicira Networks, Inc.
+Vendor: Nicira, Inc.

 Version: @VERSION@
 
 License: ASL 2.0
 Version: @VERSION@
 
 License: ASL 2.0

diff --git a/rhel/usr_share_openvswitch_scripts_sysconfig.template b/rhel/usr_share_openvswitch_scripts_sysconfig.template
index 257fc8239aa95ec361867896ff7d83cabaeb637a..812060d3c20cad9444e3b9969d3f8a4a498a9525 100644 (file)
--- a/rhel/usr_share_openvswitch_scripts_sysconfig.template
+++ b/rhel/usr_share_openvswitch_scripts_sysconfig.template
@@ -1,6 +1,6 @@
 ### Configuration options for openvswitch
 
 ### Configuration options for openvswitch
 

-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira, Inc.

 
 # FORCE_COREFILES: If 'yes' then core files will be enabled.
 # FORCE_COREFILES=yes
 
 # FORCE_COREFILES: If 'yes' then core files will be enabled.
 # FORCE_COREFILES=yes

diff --git a/tests/MockXenAPI.py b/tests/MockXenAPI.py
index 24f8bd7776194c61b36464e186f9afb28333a66a..0c02dd5499826f9cb76f63cd3190012d9d51aa90 100644 (file)
--- a/tests/MockXenAPI.py
+++ b/tests/MockXenAPI.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/tests/appctl.py b/tests/appctl.py
index 4a2865e1369bbd73fd137bb594b2a61acb5316d8..e5698ef877dfb5a861ad986c1cdff58a7c123532 100644 (file)
--- a/tests/appctl.py
+++ b/tests/appctl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Nicira Networks.
+# Copyright (c) 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.
 #
 # 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/tests/flowgen.pl b/tests/flowgen.pl
index 95c8f48da7f541226f716bcba83df3d2ca7306b0..2f6886990bb8e76146de42504f183f6ecf302bfc 100755 (executable)
--- a/tests/flowgen.pl
+++ b/tests/flowgen.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
 #! /usr/bin/perl
 

-# Copyright (c) 2009, 2010, 2011 Nicira Networks.
+# Copyright (c) 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.
 #
 # 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/tests/ofp-print.at b/tests/ofp-print.at
index feaea85f86c3b1e4e1f0b05078ed330b1279aa53..2b172d497131fc77499f924f1f883bca46f58c5c 100644 (file)
--- a/tests/ofp-print.at
+++ b/tests/ofp-print.at
@@ -421,8 +421,8 @@ AT_SETUP([OFPST_DESC reply])
 AT_KEYWORDS([ofp-print OFPT_STATS_REPLY])
 AT_CHECK([ovs-ofctl ofp-print "\
 01 11 04 2c 00 00 00 01 00 00 00 00 4e 69 63 69 \
 AT_KEYWORDS([ofp-print OFPT_STATS_REPLY])
 AT_CHECK([ovs-ofctl ofp-print "\
 01 11 04 2c 00 00 00 01 00 00 00 00 4e 69 63 69 \

-72 61 20 4e 65 74 77 6f 72 6b 73 2c 20 49 6e 63 \
-2e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
+72 61 2c 20 49 6e 63 2e 00 00 00 00 00 00 00 00 \
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \

 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 \


@@ -489,7 +489,7 @@ AT_CHECK([ovs-ofctl ofp-print "\
 00 00 00 00 00 00 00 00 00 00 00 00 \
 "], [0], [dnl
 OFPST_DESC reply (xid=0x1):
 00 00 00 00 00 00 00 00 00 00 00 00 \
 "], [0], [dnl
 OFPST_DESC reply (xid=0x1):

-Manufacturer: Nicira Networks, Inc.
+Manufacturer: Nicira, Inc.

 Hardware: Open vSwitch
 Software: 1.1.0pre2
 Serial Num: None
 Hardware: Open vSwitch
 Software: 1.1.0pre2
 Serial Num: None

diff --git a/tests/test-aes128.c b/tests/test-aes128.c
index e7e990c691ecae31ffb2b327edeca3a800b10806..19874b10be3c12b1bd61f066a350cf416c061fdf 100644 (file)
--- a/tests/test-aes128.c
+++ b/tests/test-aes128.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/tests/test-bundle.c b/tests/test-bundle.c
index 16e264d2b2496e9fab5ae3afad494c1452da1627..672c426e62a2707fab17d307c5f10bae2cba0c4c 100644 (file)
--- a/tests/test-bundle.c
+++ b/tests/test-bundle.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/tests/test-byte-order.c b/tests/test-byte-order.c
index 1c5bf388e5580007d23a3903dab254827e592c73..ab396278ed15102c7418d4b29445997fc51a2efc 100644 (file)
--- a/tests/test-byte-order.c
+++ b/tests/test-byte-order.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-classifier.c b/tests/test-classifier.c
index 1a07790394589404d4cb79c21849e94fead4ff35..fcafdb2dbdd202fd7317f94f78ef8fa37d98836c 100644 (file)
--- a/tests/test-classifier.c
+++ b/tests/test-classifier.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.
  *
  * 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/tests/test-csum.c b/tests/test-csum.c
index 86de43095e9cb6605a664ce179b77e85dc4b92f1..5f736d6cc929f7ee70b9234939899be4e93ea576 100644 (file)
--- a/tests/test-csum.c
+++ b/tests/test-csum.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-daemon.py b/tests/test-daemon.py
index 4fa07eabfff2c7b20358dbb4c92d05cd5e12a878..b759cf95503baf5883a3743d8ac3f8927dc24d2d 100644 (file)
--- a/tests/test-daemon.py
+++ b/tests/test-daemon.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011 Nicira Networks.
+# Copyright (c) 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.
 #
 # 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/tests/test-file_name.c b/tests/test-file_name.c
index a9d1ab94d2a9a5f0daebea93da4a61a19a86c759..3d4eaf1d424cf057b694245d8b270f590a05511c 100644 (file)
--- a/tests/test-file_name.c
+++ b/tests/test-file_name.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/tests/test-flows.c b/tests/test-flows.c
index 55f7dee6731e51d298084826fab9fe0d707f2d6b..59f88fd6b5623b5e9a625413c392080e20c62f10 100644 (file)
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-hash.c b/tests/test-hash.c
index 1acceac9a55a7e15b05de672dc9319f6ac15fe5f..bdf1435f40e3bdf9a1693093c5080ba14b0730ad 100644 (file)
--- a/tests/test-hash.c
+++ b/tests/test-hash.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-heap.c b/tests/test-heap.c
index 0541b8d8e4c75b4a9b58c525226d9e0b857a39cc..dd5aaa956d669bdc6f607996c4a62e2e787714a7 100644 (file)
--- a/tests/test-heap.c
+++ b/tests/test-heap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-hmap.c b/tests/test-hmap.c
index be6bcf4a784c9ee105adef847f08dde83922c8a3..c202eae14cd3e2314de77dfa5d49f7535c1f8d76 100644 (file)
--- a/tests/test-hmap.c
+++ b/tests/test-hmap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/tests/test-json.c b/tests/test-json.c
index f297dc205ea0c0f0d804ec6a61e094158a485fe6..c7c01c8e874ef7051b2c6dab665af45a52206ef7 100644 (file)
--- a/tests/test-json.c
+++ b/tests/test-json.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/tests/test-json.py b/tests/test-json.py
index 0ec1cfc305dd6f0b2738dff56fa7fb5acd0538a2..d9f0bfe6df5c1614bab27e01d443b62032f0cb55 100644 (file)
--- a/tests/test-json.py
+++ b/tests/test-json.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/tests/test-jsonrpc.c b/tests/test-jsonrpc.c
index 9c585aa66eff79372ce183d45e442b13d324b274..7cc708a50a7a7f08f84838c2db77193fdb5ac70c 100644 (file)
--- a/tests/test-jsonrpc.c
+++ b/tests/test-jsonrpc.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.
  *
  * 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/tests/test-jsonrpc.py b/tests/test-jsonrpc.py
index 9a24933b451a1230ac5938090b194e892025da3b..86db4aad92b9d9fd9679f7854d12a8bf5b938a3b 100644 (file)
--- a/tests/test-jsonrpc.py
+++ b/tests/test-jsonrpc.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, 2011 Nicira Networks
+# Copyright (c) 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.
 #
 # 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/tests/test-list.c b/tests/test-list.c
index b4ddd02e16df1aa8a14ec04843e43f14ed754ddb..50748184af2ce45a78bb85f8ea1df7d0e0841e56 100644 (file)
--- a/tests/test-list.c
+++ b/tests/test-list.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.
  *
  * 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/tests/test-lockfile.c b/tests/test-lockfile.c
index a9ac17f2f226ad794c72bd656b61571ac4d625f7..d28c1b4b7089e227d3aead64794741df42ffd3bd 100644 (file)
--- a/tests/test-lockfile.c
+++ b/tests/test-lockfile.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-multipath.c b/tests/test-multipath.c
index 03a666f40aa57d54e98acac0afedb728261fcd6f..483eb3db598054212b0886803d3a282e5e352767 100644 (file)
--- a/tests/test-multipath.c
+++ b/tests/test-multipath.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/tests/test-netflow.c b/tests/test-netflow.c
index 5f30c6360dd8afa217d67c979017701d14d400dc..85ab5e743447d075602f3f38d1b66ccd4964eeee 100644 (file)
--- a/tests/test-netflow.c
+++ b/tests/test-netflow.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-odp.c b/tests/test-odp.c
index 9ae897c5047bb32dd3e4dbe319bd39782bbdc488..123db71a7a7405337e0dc1b376ca6e3bfbc335f6 100644 (file)
--- a/tests/test-odp.c
+++ b/tests/test-odp.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.
  *
  * 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/tests/test-ovsdb.c b/tests/test-ovsdb.c
index 4e2e416cf1cd3cc9dda1979d2c04ae2ce63e4948..a1ad2cbc85655f49339ad540b78784380e6bc278 100644 (file)
--- a/tests/test-ovsdb.c
+++ b/tests/test-ovsdb.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.
  *
  * 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/tests/test-ovsdb.py b/tests/test-ovsdb.py
index 77b3a2c1932c2056b48a333df9479cd5df4b9029..1350ccdef4d6f4ece0aa8d3e392e2049a808ecac 100644 (file)
--- a/tests/test-ovsdb.py
+++ b/tests/test-ovsdb.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/tests/test-packets.c b/tests/test-packets.c
index dda4797f56288cdff8fa75556bc6c92ebc6ab5d4..e60e463c981fca96671ec64138e17f4202cd9ce0 100644 (file)
--- a/tests/test-packets.c
+++ b/tests/test-packets.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.
  *
  * 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/tests/test-random.c b/tests/test-random.c
index 9fcc632c7d637787a4e7e33c579025a3425197c1..7b1c2ac7554bed75df81ecd820698104e44076ed 100644 (file)
--- a/tests/test-random.c
+++ b/tests/test-random.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/tests/test-reconnect.c b/tests/test-reconnect.c
index 494046ccfa91c7a1aaf757cf8285ba71c5f697be..14569dbadec3abcf93a4e6bad3f768b7bcf692bb 100644 (file)
--- a/tests/test-reconnect.c
+++ b/tests/test-reconnect.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-reconnect.py b/tests/test-reconnect.py
index 5556ceeecc43f639491dbb3ef6e11d33e0439a12..44b4723a9491eb96a971a8ece50bbfda3221654f 100644 (file)
--- a/tests/test-reconnect.py
+++ b/tests/test-reconnect.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/tests/test-sha1.c b/tests/test-sha1.c
index c7aec4b7429cc73240df7fb0b43a4a1b2ec4d0ae..8eb5c5ead86e505053d42f1974ca97e29784464f 100644 (file)
--- a/tests/test-sha1.c
+++ b/tests/test-sha1.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2011 Nicira Networks.
+ * Copyright (c) 2009, 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.
  *
  * 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/tests/test-stp.c b/tests/test-stp.c
index 259dc74a3725df974d0eefc0662fe2c87ccf198f..87c12a0cc29cf0aa2c99800fb8939e5dffa09921 100644 (file)
--- a/tests/test-stp.c
+++ b/tests/test-stp.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 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.
  *
  * 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/tests/test-strtok_r.c b/tests/test-strtok_r.c
index b30263032e1eec5d691f5b8109af1c1d7a1e0bf4..105a72adb0044f2453ab64f2a1fe0e9b7b625a64 100644 (file)
--- a/tests/test-strtok_r.c
+++ b/tests/test-strtok_r.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/tests/test-timeval.c b/tests/test-timeval.c
index 442b27af6cd0fc90a6afc73839c86049af935d2c..d277fc96983f12171091d6e187d90de6cb1d5eb6 100644 (file)
--- a/tests/test-timeval.c
+++ b/tests/test-timeval.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-type-props.c b/tests/test-type-props.c
index 3c5ff6aeaba77b5133d9881e414bcbf02a3c2545..3f2472545fa9a4e6ccbbf76122fc1a5bccb9d22a 100644 (file)
--- a/tests/test-type-props.c
+++ b/tests/test-type-props.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 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.
  *
  * 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/tests/test-unix-socket.c b/tests/test-unix-socket.c
index ec900481495f5544cea11cdceaf301f7e33d1bee..9279fdab692f63373793075ad451a365513700be 100644 (file)
--- a/tests/test-unix-socket.c
+++ b/tests/test-unix-socket.c
@@ -1,5 +1,5 @@
 /*
 /*

- * 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.
  *
  * 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/tests/test-unixctl.py b/tests/test-unixctl.py
index c262a958da9ca92104afe99fb5bef4fcf5586348..038c1bd684f19c92acd4c987451d86a64a5899b2 100644 (file)
--- a/tests/test-unixctl.py
+++ b/tests/test-unixctl.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Nicira Networks.
+# Copyright (c) 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.
 #
 # 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/tests/test-util.c b/tests/test-util.c
index 23b86e8c8705871171687132d6ed03954548653a..c8026c13bf1de44fa628cafb57018a968a23107b 100644 (file)
--- a/tests/test-util.c
+++ b/tests/test-util.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-uuid.c b/tests/test-uuid.c
index 750b74ebb73e7a401ff26feaece08d802169f63e..a13d7793e53e77f47ea93cf94d444ec01a869ef9 100644 (file)
--- a/tests/test-uuid.c
+++ b/tests/test-uuid.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-vconn.c b/tests/test-vconn.c
index 8aa5a8d8d516578593786b488168be8089f857c9..3398c4aa3d0f2d1aede5dd3bc193473d48e8c0e7 100644 (file)
--- a/tests/test-vconn.c
+++ b/tests/test-vconn.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 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.
  *
  * 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/tests/test-vlog.py b/tests/test-vlog.py
index 1c6a2df12df4320d971ff4f6037b1fce1c1ad618..f6d0cec320a776564686a8b09b7bd7b725645d38 100644 (file)
--- a/tests/test-vlog.py
+++ b/tests/test-vlog.py
@@ -1,4 +1,4 @@
-# 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.
 #
 # 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/tests/testsuite.at b/tests/testsuite.at
index 60401d6937c37c5d34a678028fbc15610b949c73..9796b03627d357f52e4f1821b7d8c5ff0e898ecd 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,6 @@
 AT_INIT
 
 AT_INIT
 

-AT_COPYRIGHT([Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+AT_COPYRIGHT([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.
 
 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/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
index 3b4144ac897d7ad813617bda94f80c5ce929c6ba..73bb34464e578ade58f5c5e70cb2aa541b599462 100644 (file)
--- a/third-party/ofp-tcpdump.patch
+++ b/third-party/ofp-tcpdump.patch
@@ -46,7 +46,7 @@
 --- tcpdump/print-openflow.c   1969-12-31 16:00:00.000000000 -0800
 +++ tcpdump/print-openflow.c   2009-05-11 15:38:41.000000000 -0700
 @@ -0,0 +1,46 @@
 --- tcpdump/print-openflow.c   1969-12-31 16:00:00.000000000 -0800
 +++ tcpdump/print-openflow.c   2009-05-11 15:38:41.000000000 -0700
 @@ -0,0 +1,46 @@

-+/* Copyright (C) 2007, 2008, 2009 Nicira Networks.
++/* Copyright (C) 2007, 2008, 2009 Nicira, Inc.

 +
 +   Redistribution and use in source and binary forms, with or without
 +   modification, are permitted provided that the following conditions
 +
 +   Redistribution and use in source and binary forms, with or without
 +   modification, are permitted provided that the following conditions

diff --git a/utilities/bugtool/ovs-bugtool-cfm-show b/utilities/bugtool/ovs-bugtool-cfm-show
index b137a2d83d5a50b9b95441b75fc7788e2412f8a8..ccc058bc422044acf7855c6cafc43c1be3b20299 100755 (executable)
--- 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
 #
 # 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
 
 ovs-appctl cfm/show

diff --git a/utilities/bugtool/ovs-bugtool-coverage-show b/utilities/bugtool/ovs-bugtool-coverage-show
index 4cc55bd91524034f9adfeb4f483b797749edd477..b94fd96082893ed22951e2db1ee21dd9ae7dc9c5 100755 (executable)
--- 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
 #
 # 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
 
 ovs-appctl coverage/show

diff --git a/utilities/bugtool/ovs-bugtool-daemons-ver b/utilities/bugtool/ovs-bugtool-daemons-ver
index 672e7e1b45d3f0a9bd86ee98cc63456d22155026..952ed65b460f3c98059ad39a366c826a0f402196 100755 (executable)
--- 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
 #
 # 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
 
 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 2a2d72bf292d8d6d5ed7065d0f67961571b99537..4c1728c88caa95b3408a2ee297759820774f0af4 100755 (executable)
--- 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
 #
 # 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
 
 ovs-appctl lacp/show

diff --git a/utilities/bugtool/ovs-bugtool-ovsdb-dump b/utilities/bugtool/ovs-bugtool-ovsdb-dump
index 9e4d6620b6655c84d25409500f3eb88eb99c476d..4eef6f56ecd416c878b50cb2bb6b9c1ec61c5838 100755 (executable)
--- 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
 #
 # 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
 
 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 df07f2a8ce56195b85c64895d6612554396bb12c..5e6ae0a1bd78740da5fb744e960081bb3b3d0faf 100755 (executable)
--- 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
 #
 # 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
 
 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 46ac7fbdff00cefcdd0a7fac9b185759b3600ca2..fe433d83f1e0ff0f0099af229c3667537f7ad058 100755 (executable)
--- 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
 #
 # 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
 
 ovs-vsctl --timeout=5 show

diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index 1e0fc7c302bfee856bdeec07d8f728de328b2ec0..2df3e66bebd2804f8497a45e2e826e536d373666 100755 (executable)
--- 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.
 # 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:
 
 #
 # 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 8432ba92b5b270e856afe23b4b2510c344a6a7a7..c571640c47631311deb56c1b10a9a005ebcdca42 100644 (file)
--- 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.
 
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  USA.
 

- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.

 -->
 
 <collect>
 -->
 
 <collect>

diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index dab05ef2f48f7901ae56f50af6ef1555c6593f27..8ae498faf6029f216b3dc6c9aa8d5a829c192975 100644 (file)
--- 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.
 
  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>
 -->
 
 <collect>

diff --git a/utilities/bugtool/plugins/system-configuration.xml b/utilities/bugtool/plugins/system-configuration.xml
index a948fd24b97bee26d90b632e3ef59dc9c9d36dc5..a59a6981d9d6e44721a554b82b80a72ca12b5298 100644 (file)
--- 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.
 
  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>
 -->
 <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 260e6dc812c9189697d0849a9c2135421f84332f..ea6f32e76b9ab0761039ffcb8b6bfd5f93432103 100644 (file)
--- 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.
 
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  USA.
 

- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.

 -->
 
 <collect>
 -->
 
 <collect>

diff --git a/utilities/bugtool/plugins/system-logs/openvswitch.xml b/utilities/bugtool/plugins/system-logs/openvswitch.xml
index 914bd5390d598e09ec3e82e1b8c11c3a56762f70..f735113302eccdd19ae392917815471f86dde9ca 100644 (file)
--- 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.
 
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
  USA.
 

- Copyright (C) 2011 Nicira Networks.
+ Copyright (C) 2011 Nicira, Inc.

 -->
 
 <collect>
 -->
 
 <collect>

diff --git a/utilities/nlmon.c b/utilities/nlmon.c
index e6cf0235511a85d29ce88348856f0bac854a1161..99b060c977fe56c9a8687234b6deefdc32a75d3c 100644 (file)
--- 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.
  *
  * 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 f761d5ac2c068081a7e3c5620733ce2618c47e2d..ddeeb1dfabd389ee24cc6dd5ce34f8819a59e8d5 100644 (file)
--- 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.
  *
  * 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 e846902d856697dad1bc31bab4584819499d6d58..162f7cf0a5c71bb00a2f6bbb5d22462904c60d22 100644 (file)
--- 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.
  *
  * 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 fa60f8f68f53b6e5b757d0d68385a0f08632df9b..d70b630517930fd2dad2a323e3835569a995bbd9 100644 (file)
--- 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.
  *
  * 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 68853826b55a142516820e4e92ded7e65e2f7eae..0af90f07c28092fda6186fbfcac09c2ffa18fb30 100755 (executable)
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /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.
 #
 # 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 56d648c2823bb5068d85a1c8149a700c6a8c0a47..7c191164b8d2b981d88ed20ec7e43cc832657678 100644 (file)
--- 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.
  *
  * 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 7a15aaecf7cedba7c37149d5b9ecb08c8f629288..b8dc060a3c659f561416a7b6d15453bab4827723 100644 (file)
--- 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.
 
 # 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.
 #
 # 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 2b91a2894ffd66609855d89dd11e46f2aaa95012..86c0a859b11bda7de1dbbf3ac42f0e45c32c1eb9 100644 (file)
--- 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.
  *
  * 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 3f4cb16ba0796d474d6877b0fced68f649ee365f..72417e51198dd0f40311e0ac15268c078b70e3a7 100755 (executable)
--- a/utilities/ovs-parse-leaks.in
+++ b/utilities/ovs-parse-leaks.in
@@ -1,6 +1,6 @@
 #! @PERL@
 
 #! @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.
 #
 # 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 8ab475612de0fa5024ccc2fdb01e7127cb915613..530648035c760d6a3e5531d8f6948979ad9554f2 100755 (executable)
--- a/utilities/ovs-pcap.in
+++ b/utilities/ovs-pcap.in
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
 #! @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.
 #
 # 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 c8c53d09c1c2e0bf36c14aeea7557a11f947aa90..3ef900ef52b7d4e4b9df052c88fa8a0573c34944 100755 (executable)
--- a/utilities/ovs-pki-cgi.in
+++ b/utilities/ovs-pki-cgi.in
@@ -1,6 +1,6 @@
 #! @PERL@
 
 #! @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.
 #
 # 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 e79ecc6258ed928017bacd14e3c629124531eb60..019ffcfadf922a766a751299f13fc58923aaf616 100755 (executable)
--- a/utilities/ovs-pki.in
+++ b/utilities/ovs-pki.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 #! /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.
 #
 # 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 de3129042d27592acda272e83de5d8b256158b7a..297c2fa3faab6b8736fb2eb4c1a2bb165f80c912 100755 (executable)
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -1,6 +1,6 @@
 #! /bin/sh
 
 #! /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.
 #
 # 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 4f239057b4715ad4cdccbc5d2776925eeb6d015a..0268c504ac880f11be27de22bb3e6260d5125f8a 100755 (executable)
--- a/utilities/ovs-tcpundump.in
+++ b/utilities/ovs-tcpundump.in
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
 #! @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.
 #
 # 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 f459dec4bbe6313604f3fbc4b01b81ef0ff74d97..8688f61721f236689ba3ba38c106a1b64682d9ee 100644 (file)
--- 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.
  *
  * 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 f937845307f2da58fab0dcd00dd10f84e511816c..e2294989fd64f4a8332d7123443313dbf3f853cd 100755 (executable)
--- a/utilities/ovs-vlan-test.in
+++ b/utilities/ovs-vlan-test.in
@@ -1,6 +1,6 @@
 #! @PYTHON@
 #
 #! @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.
 #
 # 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 4c5362c83d1a2b5f9c775447cccb2dfbef308914..2fc87f00277fc0cc57198e6fe1f9f1b15a71b229 100644 (file)
--- 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.
  *
  * 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/vswitchd/bridge.c b/vswitchd/bridge.c
index 61bf21c63fb2eddfdbd595c5f7c88aaaf6cd8f4e..13eb80bdd144ad575e3511850be48ddc4f64067e 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/bridge.h b/vswitchd/bridge.h
index 2d3883384bd32d7726b5d323652a8431ed4a0676..ecd6ff5f0d66b7ccad8dc50cf657cd3ab7ae9a57 100644 (file)
--- a/vswitchd/bridge.h
+++ b/vswitchd/bridge.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index 8b1ad5d8bc415d4dd50e6272e8cc2754f9771f7c..6c19edb010cfb8e76cf52ecd3116453a9f8fb096 100644 (file)
--- a/vswitchd/ovs-brcompatd.c
+++ b/vswitchd/ovs-brcompatd.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c
index f7ddee1d633229b6ac431973f2480638a1729d54..f97df8d62625121162308d6cacfe2a4984e46483 100644 (file)
--- a/vswitchd/ovs-vswitchd.c
+++ b/vswitchd/ovs-vswitchd.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/system-stats.c b/vswitchd/system-stats.c
index a3b4db44341c337cb94e2b65f83ed9726f1b4d79..cecd8f482cb506dbbf8ca295c97639b95e2debaa 100644 (file)
--- a/vswitchd/system-stats.c
+++ b/vswitchd/system-stats.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/system-stats.h b/vswitchd/system-stats.h
index 559be692d8dfbfe77c94bd6c9766a79bbd40e809..ac4a65e3c83933d8b18f70b43c95794aebb15ee3 100644 (file)
--- a/vswitchd/system-stats.h
+++ b/vswitchd/system-stats.h
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/xenserver.c b/vswitchd/xenserver.c
index eed798f4155075bb9d44e0971bb52c762b256b81..1f29daf2d4f872f618ea253aee955776c21de175 100644 (file)
--- a/vswitchd/xenserver.c
+++ b/vswitchd/xenserver.c
@@ -1,4 +1,4 @@
-/* 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.
  *
  * 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/vswitchd/xenserver.h b/vswitchd/xenserver.h
index ad9ed8c4a0d2a950e3fec6600bc01d33b0d6e67f..48c7461e6f9368c628da346dc11ed93e2fc1d61d 100644 (file)
--- a/vswitchd/xenserver.h
+++ b/vswitchd/xenserver.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 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.
  *
  * 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/xenserver/README b/xenserver/README
index 4efdc3799e1074dd99994b9673216dd57e057cf6..5413c67acc8ebd1a5a6bdc1f2dbb61ca5006219d 100644 (file)
--- a/xenserver/README
+++ b/xenserver/README
@@ -126,7 +126,7 @@ scripts are located in ../utilities/bugtool:
         Script to dump version information for all Open vSwitch daemons.
 
 ----------------------------------------------------------------------
         Script to dump version information for all Open vSwitch daemons.
 
 ----------------------------------------------------------------------

-Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+Copyright (C) 2009, 2010, 2011 Nicira, Inc.

 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright

diff --git a/xenserver/automake.mk b/xenserver/automake.mk
index cb6016fba3cea150b423e632a7a0433d0a6b4574..413e6347b1c0ab5e1a2ce5b849a77a5efa8d269c 100644 (file)
--- a/xenserver/automake.mk
+++ b/xenserver/automake.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
index aa65657ec5b6e8e146966b65b307478394e80e21..b2248b7addbe43c90d13cbbdd177757e6ccc578f 100755 (executable)
--- a/xenserver/etc_init.d_openvswitch
+++ b/xenserver/etc_init.d_openvswitch
@@ -5,7 +5,7 @@
 # chkconfig: 2345 09 91
 # description: Manage Open vSwitch kernel modules and user-space daemons
 
 # chkconfig: 2345 09 91
 # description: Manage Open vSwitch kernel modules and user-space daemons
 

-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 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.
 #
 # 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/xenserver/etc_init.d_openvswitch-xapi-update b/xenserver/etc_init.d_openvswitch-xapi-update
index 14d2cc9bd78faf8555f683bce80c1c71bbfd8f91..12a9db2a1d4571f37557cd02c7b440f77d796bdc 100755 (executable)
--- a/xenserver/etc_init.d_openvswitch-xapi-update
+++ b/xenserver/etc_init.d_openvswitch-xapi-update
@@ -5,7 +5,7 @@
 # chkconfig: 2345 95 01
 # description: Update Open vSwitch configuration from XAPI database at boot
 
 # chkconfig: 2345 95 01
 # description: Update Open vSwitch configuration from XAPI database at boot
 

-# Copyright (C) 2009, 2010 Nicira Networks, Inc.
+# 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.
 #
 # 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/xenserver/etc_logrotate.d_openvswitch b/xenserver/etc_logrotate.d_openvswitch
index c1ead1459f379ddf91e813ec983c27ec924a06c6..a677ca6eaaaaec65f6d6d466bb28ed6451441276 100644 (file)
--- a/xenserver/etc_logrotate.d_openvswitch
+++ b/xenserver/etc_logrotate.d_openvswitch
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/xenserver/etc_profile.d_openvswitch.sh b/xenserver/etc_profile.d_openvswitch.sh
index 7376f53f1fe4798ef19c2b2a7d54c1a8ee8d9a8c..63b254359fc1ab3337c1c6aeae3de1c584cdc425 100644 (file)
--- a/xenserver/etc_profile.d_openvswitch.sh
+++ b/xenserver/etc_profile.d_openvswitch.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright

diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
index ef4d11a8e4933961513b63d5aae4135ea9e7af05..3945974c0726fd5d258edc052484d27061c65358 100755 (executable)
--- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
+++ b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
@@ -4,7 +4,7 @@
 # ovs-vswitchd configuration that are managed in the xapi database when 
 # integrated with Citrix management tools.
 
 # ovs-vswitchd configuration that are managed in the xapi database when 
 # integrated with Citrix management tools.
 

-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 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.
 #
 # 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/xenserver/openvswitch-xen.spec.in b/xenserver/openvswitch-xen.spec.in
index 46b6f60e2e068a83c0be29fbf9d6b4cea95caf41..673cbaf314bd1524b661223979d3132bf862d510 100644 (file)
--- a/xenserver/openvswitch-xen.spec.in
+++ b/xenserver/openvswitch-xen.spec.in
@@ -1,6 +1,6 @@
 # Spec file for Open vSwitch.
 
 # Spec file for Open vSwitch.
 

-# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.

 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright


@@ -41,7 +41,7 @@ Name: openvswitch
 Summary: Open vSwitch daemon/database/utilities
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/
 Summary: Open vSwitch daemon/database/utilities
 Group: System Environment/Daemons
 URL: http://www.openvswitch.org/

-Vendor: Nicira Networks, Inc.
+Vendor: Nicira, Inc.

 Version: %{openvswitch_version}
 
 License: ASL 2.0
 Version: %{openvswitch_version}
 
 License: ASL 2.0

diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
index 31e9b5177bf530499f71cb04bd972ee559007fa9..2262c0b3c3808830c682c1f496477ea29bb79f5e 100644 (file)
--- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
+++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2008,2009,2011 Citrix Systems, Inc.
 # Copyright (c) 2008,2009,2011 Citrix Systems, Inc.

-# Copyright (c) 2009,2010,2011 Nicira Networks.
+# Copyright (c) 2009,2010,2011 Nicira, Inc.

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published

diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
index 93532c8477110bfcb045d7517f649b97b8afc2c5..e1764052c57a5a2571a25e080965ed31ea2d874e 100644 (file)
--- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
+++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2011 Citrix Systems Inc.
 # Copyright (c) 2007-2011 Citrix Systems Inc.

-# Copyright (c) 2009,2010,2011 Nicira Networks.
+# Copyright (c) 2009,2010,2011 Nicira, Inc.

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
index 77c07bcd6e356266e3159a2fdede125c7d81f9ff..fc2158247a1039a416adfe6d9acf0ca58d6cd57a 100755 (executable)
--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
@@ -1,5 +1,5 @@
 #!/usr/bin/python
 #!/usr/bin/python

-# 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.
 #
 # 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/xenserver/usr_share_openvswitch_scripts_sysconfig.template b/xenserver/usr_share_openvswitch_scripts_sysconfig.template
index 26543af1b52e8b64f51e82f600407714c4c7782f..bb85d67a2239eed9231e5389d60fedb8004e9d0a 100644 (file)
--- a/xenserver/usr_share_openvswitch_scripts_sysconfig.template
+++ b/xenserver/usr_share_openvswitch_scripts_sysconfig.template
@@ -1,6 +1,6 @@
 ### Configuration options for openvswitch
 
 ### Configuration options for openvswitch
 

-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010, 2011 Nicira, Inc.

 
 # FORCE_COREFILES: If 'yes' then core files will be enabled.
 # FORCE_COREFILES=yes
 
 # FORCE_COREFILES: If 'yes' then core files will be enabled.
 # FORCE_COREFILES=yes