Skip to content

Commit be26152

Browse files
Merge pull request #2939 from ggouaillardet/topic/pmix2x_6ed27be839e3f17a2b93885321e15fb26d802e93
pmix2x: Update to latest PMIx master
2 parents 3d0541f + 7acef48 commit be26152

File tree

149 files changed

+347
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+347
-296
lines changed

opal/mca/pmix/pmix2x/pmix/INSTALL

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
99
Copyright (c) 2004-2005 The Regents of the University of California.
1010
All rights reserved.
1111
Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
12-
Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
12+
Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
1313
$COPYRIGHT$
1414

1515
Additional copyrights may follow
@@ -85,3 +85,4 @@ shell$ make install
8585
Parallel make is generally only helpful in the build phase; the
8686
installation process is mostly serial and does not benefit much from
8787
parallel make.
88+

opal/mca/pmix/pmix2x/pmix/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Copyright (c) 2010 ARM ltd. All rights reserved.
4545
Copyright (c) 2010-2011 Alex Brick <[email protected]>. All rights reserved.
4646
Copyright (c) 2012 The University of Wisconsin-La Crosse. All rights
4747
reserved.
48-
Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
48+
Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
4949
Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
5050

5151
$COPYRIGHT$

opal/mca/pmix/pmix2x/pmix/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# All rights reserved.
1212
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.
1313
# Copyright (c) 2012-2013 Los Alamos National Security, Inc. All rights reserved.
14-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
14+
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
1515
# $COPYRIGHT$
1616
#
1717
# Additional copyrights may follow
@@ -61,3 +61,4 @@ nroff:
6161

6262
dist-hook:
6363
env LS_COLORS= sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(PMIX_VERSION)" "$(PMIX_REPO_REV)"
64+

opal/mca/pmix/pmix2x/pmix/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Copyright (c) 2007 Myricom, Inc. All rights reserved.
1515
Copyright (c) 2008 IBM Corporation. All rights reserved.
1616
Copyright (c) 2010 Oak Ridge National Labs. All rights reserved.
1717
Copyright (c) 2011 University of Houston. All rights reserved.
18-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
18+
Copyright (c) 2013-2015 Intel, Inc. All rights reserved
1919
$COPYRIGHT$
2020

2121
Additional copyrights may follow

opal/mca/pmix/pmix2x/pmix/VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ greek=a1
3030
# command, or with the date (if "git describe" fails) in the form of
3131
# "date<date>".
3232

33-
repo_rev=git972f79a
33+
repo_rev=git6ed27be
3434

3535
# If tarball_version is not empty, it is used as the version string in
3636
# the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
4444

4545
# The date when this release was created
4646

47-
date="Jan 31, 2017"
47+
date="Feb 08, 2017"
4848

4949
# The shared library version of each of PMIx's public libraries.
5050
# These versions are maintained in accordance with the "Library

opal/mca/pmix/pmix2x/pmix/config/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
1+
# Copyright (c) 2013-2016 Intel, Inc. All rights reserved
22
# Copyright (c) 2016 Research Organization for Information Science
33
# and Technology (RIST). All rights reserved.
44
# Copyright (c) 2006-2016 Cisco Systems, Inc. All rights reserved.

opal/mca/pmix/pmix2x/pmix/config/c_get_alignment.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
14-
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
14+
dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
1515
dnl Copyright (c) 2015 Research Organization for Information Science
1616
dnl and Technology (RIST). All rights reserved.
1717
dnl $COPYRIGHT$

opal/mca/pmix/pmix2x/pmix/config/distscript.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
# and Technology (RIST). All rights reserved.
1616
# Copyright (c) 2015 Los Alamos National Security, LLC. All rights
1717
# reserved.
18-
# Copyright (c) 2017 Intel, Inc. All rights reserved.
1918
# $COPYRIGHT$
2019
#
2120
# Additional copyrights may follow

opal/mca/pmix/pmix2x/pmix/config/pmix_check_attributes.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- shell-script -*-
22
# PMIx copyrights:
3-
# Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
3+
# Copyright (c) 2013 Intel, Inc. All rights reserved
44
#
55
#########################
66
#

opal/mca/pmix/pmix2x/pmix/config/pmix_check_broken_qsort.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
1111
dnl Copyright (c) 2004-2005 The Regents of the University of California.
1212
dnl All rights reserved.
1313
dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
14-
dnl Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
14+
dnl Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
1515
dnl Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
1616
dnl $COPYRIGHT$
1717
dnl

0 commit comments

Comments
 (0)