Merge pull request #2255 from alex-mikheev/topic/oshmem_v1.3_cpr_updates

jladd-mlnx · web-flow · commit 9538f4d7154c · 2016-10-20T09:06:44.000-04:00
OSHMEM: updates copyrights in fortran fetch/set
diff --git a/oshmem/shmem/fortran/shmem_int4_fetch_f.c b/oshmem/shmem/fortran/shmem_int4_fetch_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/oshmem/shmem/fortran/shmem_int4_set_f.c b/oshmem/shmem/fortran/shmem_int4_set_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/oshmem/shmem/fortran/shmem_int8_fetch_f.c b/oshmem/shmem/fortran/shmem_int8_fetch_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/oshmem/shmem/fortran/shmem_int8_set_f.c b/oshmem/shmem/fortran/shmem_int8_set_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/oshmem/shmem/fortran/shmem_real4_fetch_f.c b/oshmem/shmem/fortran/shmem_real4_fetch_f.c
@@ -1,9 +1,7 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
- *
  * Additional copyrights may follow
  *
  * $HEADER$
diff --git a/oshmem/shmem/fortran/shmem_real4_set_f.c b/oshmem/shmem/fortran/shmem_real4_set_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/oshmem/shmem/fortran/shmem_real8_fetch_f.c b/oshmem/shmem/fortran/shmem_real8_fetch_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
diff --git a/oshmem/shmem/fortran/shmem_real8_set_f.c b/oshmem/shmem/fortran/shmem_real8_set_f.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) 2013      Mellanox Technologies, Inc.
+ * Copyright (c) 2016      Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2013 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2013 Mellanox Technologies, Inc.`
	`2`	`+ * Copyright (c) 2016 Mellanox Technologies, Inc.`
`3`	`3`	`* All rights reserved.`
`4`		`- * Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.`
`5`	`4`	`* $COPYRIGHT$`
`6`	`5`	`*`
`7`	`6`	`* Additional copyrights may follow`