Merge pull request #1268 from artpol84/fix_mlnx_copy

artpol84 · artpol84 · commit d80b98be98b1 · 2016-01-02T09:57:12.000+05:00
Fix Mellanox copyrights with respect to the following PRs
diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c
@@ -21,6 +21,7 @@
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/ompi/mca/coll/libnbc/nbc_ibarrier.c b/ompi/mca/coll/libnbc/nbc_ibarrier.c
@@ -9,6 +9,7 @@
  *                         reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
  *
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *
diff --git a/ompi/mca/coll/libnbc/nbc_igatherv.c b/ompi/mca/coll/libnbc/nbc_igatherv.c
@@ -12,6 +12,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015      Los Alamos National Security, LLC.  All rights
  *                         reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
  *
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *
diff --git a/ompi/mpi/c/alltoall.c b/ompi/mpi/c/alltoall.c
@@ -15,6 +15,8 @@
  *                         reserved.
  * Copyright (c) 2014-2015 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/ompi/proc/proc.c b/ompi/proc/proc.c
@@ -16,6 +16,8 @@
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved
  * Copyright (c) 2014-2015 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/btl/openib/btl_openib.c b/opal/mca/btl/openib/btl_openib.c
@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2007-2013 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
@@ -11,7 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2006-2015 Mellanox Technologies. All rights reserved.
  * Copyright (c) 2006-2015 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
diff --git a/opal/mca/btl/openib/btl_openib_proc.c b/opal/mca/btl/openib/btl_openib_proc.c
@@ -14,6 +14,8 @@
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/btl/openib/btl_openib_proc.h b/opal/mca/btl/openib/btl_openib_proc.h
@@ -11,6 +11,8 @@
  *                         All rights reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
  * Copyright (c) 2008      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/btl/vader/btl_vader.h b/opal/mca/btl/vader/btl_vader.h
@@ -14,6 +14,8 @@
  * Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/opal/mca/btl/vader/btl_vader_sendi.c b/opal/mca/btl/vader/btl_vader_sendi.c
@@ -14,6 +14,8 @@
  * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
+ *
  * $COPYRIGHT$
  *
  * Additional copyrights may follow

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`* Copyright (c) 2014 Research Organization for Information Science`
`22`	`22`	`* and Technology (RIST). All rights reserved.`
`23`	`23`	`* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.`
	`24`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
`24`	`25`	`* $COPYRIGHT$`
`25`	`26`	`*`
`26`	`27`	`* Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`* reserved.`
`10`	`10`	`* Copyright (c) 2014 Research Organization for Information Science`
`11`	`11`	`* and Technology (RIST). All rights reserved.`
	`12`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
`12`	`13`	`*`
`13`	`14`	`* Author(s): Torsten Hoefler <[email protected]>`
`14`	`15`	`*`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`* and Technology (RIST). All rights reserved.`
`13`	`13`	`* Copyright (c) 2015 Los Alamos National Security, LLC. All rights`
`14`	`14`	`* reserved.`
	`15`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
`15`	`16`	`*`
`16`	`17`	`* Author(s): Torsten Hoefler <[email protected]>`
`17`	`18`	`*`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* reserved.`
`16`	`16`	`* Copyright (c) 2014-2015 Research Organization for Information Science`
`17`	`17`	`* and Technology (RIST). All rights reserved.`
	`18`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
	`19`	`+ *`
`18`	`20`	`* $COPYRIGHT$`
`19`	`21`	`*`
`20`	`22`	`* Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`* Copyright (c) 2013-2015 Intel, Inc. All rights reserved`
`17`	`17`	`* Copyright (c) 2014-2015 Research Organization for Information Science`
`18`	`18`	`* and Technology (RIST). All rights reserved.`
	`19`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
	`20`	`+ *`
`19`	`21`	`* $COPYRIGHT$`
`20`	`22`	`*`
`21`	`23`	`* Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`* Copyright (c) 2014 Intel, Inc. All rights reserved.`
`15`	`15`	`* Copyright (c) 2015 Research Organization for Information Science`
`16`	`16`	`* and Technology (RIST). All rights reserved.`
	`17`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
	`18`	`+ *`
`17`	`19`	`* $COPYRIGHT$`
`18`	`20`	`*`
`19`	`21`	`* Additional copyrights may follow`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`* All rights reserved.`
`12`	`12`	`* Copyright (c) 2006-2007 Voltaire All rights reserved.`
`13`	`13`	`* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.`
	`14`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
	`15`	`+ *`
`14`	`16`	`* $COPYRIGHT$`
`15`	`17`	`*`
`16`	`18`	`* Additional copyrights may follow`