Merge pull request open-mpi#959 from artpol84/mlnx_copy_fix_v1.10

hppritcha · hppritcha · commit 71ad5fb59701 · 2016-02-16T09:12:54.000-07:00
Fix Mlnx copyright
diff --git a/ompi/mca/coll/libnbc/nbc_ibarrier.c b/ompi/mca/coll/libnbc/nbc_ibarrier.c
@@ -6,6 +6,7 @@
  *                         rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
+ * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
  *
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`* rights reserved.`
`7`	`7`	`* Copyright (c) 2013 Los Alamos National Security, LLC. All rights`
`8`	`8`	`* reserved.`
	`9`	`+ * Copyright (c) 2015 Mellanox Technologies. All rights reserved.`
`9`	`10`	`*`
`10`	`11`	`* Author(s): Torsten Hoefler <[email protected]>`
`11`	`12`	`*`