Skip to content

Commit a51f249

Browse files
authored
Merge pull request #2578 from jsquyres/pr/v2.0.2/update-shared-lib-versions
Update v2.0.2 release files (including VERSION/shared library versions)
2 parents 49d47fc + c1cc08a commit a51f249

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Yohann Burette <[email protected]> <[email protected]>
6060
6161

6262
63+
6364

6465
6566

@@ -99,3 +100,5 @@ L. R. Rajeshnarayanan <[email protected]> <l.r.rajeshnarayanan@intel
99100

100101
Aur�lien Bouteiller <[email protected]> <[email protected]>
101102
Aur�lien Bouteiller <[email protected]> <darter4.nics.utk.edu>
103+
104+

AUTHORS

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ individual who committed them.
1212

1313
Abhishek Kulkarni, Indiana University
1414
15+
Aboorva Devarajan
16+
1517
Adrian Knoth, Friedrich-Schiller-Universitat Jena
1618
1719
Adrian Reber, Hochschule Esslingen
@@ -94,6 +96,8 @@ Eugene Loh, Sun, Oracle
9496
Francois WELLENREITER, Individual
9597
9698
99+
Gabriel Pichot
100+
97101
Galen Shipman, Los Alamos National Laboratory
98102
99103
Geoffrey Paulsen, IBM
@@ -124,8 +128,8 @@ Howard Pritchard, Los Alamos National Laboratory
124128
Iain Bason, Sun, Oracle
125129
126130
Igor Ivanov, Mellanox
127-
128131
132+
129133
Igor Usarov, Mellanox
130134
131135
Jeff Squyres, University of Indiana, Cisco
@@ -142,6 +146,8 @@ Jose Roman, Universitat Politecnica de Valencia
142146
Josh Hursey, Indiana University, Oak Ridge National Laboratory, Los Alamos National Laboratory, Lawrence Berkeley National Laboratory, University of Wisconsin-La Crosse, IBM
143147
144148
149+
Joshua Gerrard
150+
145151
Joshua Ladd, Mellanox
146152
147153
@@ -221,6 +227,8 @@ Pierre Lemarinier, University of Tennessee-Knoxville
221227
222228
Piotr Lesnicki, Bull
223229
230+
Potnuri Bharat Teja, Chelsio
231+
224232
Prabhanjan Kambadur, Indiana University
225233
226234
Rainer Keller, High Performance Computing Center, Stuttgart, Oak Ridge National Laboratory, Hochschule fuer Technik Stuttgart

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Much, much more information is also available in the Open MPI FAQ:
5959
===========================================================================
6060

6161
The following abbreviated list of release notes applies to this code
62-
base as of this writing (July 2016):
62+
base as of this writing (December 2016):
6363

6464
General notes
6565
-------------

VERSION

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ release=2
2424
# requirement is that it must be entirely printable ASCII characters
2525
# and have no white space.
2626

27-
greek=a1
27+
greek=rc1
2828

2929
# If repo_rev is empty, then the repository version number will be
3030
# obtained during "make dist" via the "git describe --tags --always"
@@ -82,16 +82,17 @@ date="Unreleased developer copy"
8282
# Version numbers are described in the Libtool current:revision:age
8383
# format.
8484

85-
libmpi_so_version=20:1:0
86-
libmpi_cxx_so_version=20:0:0
87-
libmpi_mpifh_so_version=20:0:0
88-
libmpi_usempi_tkr_so_version=20:0:0
89-
libmpi_usempi_ignore_tkr_so_version=20:0:0
90-
libmpi_usempif08_so_version=20:0:0
91-
libopen_rte_so_version=20:0:0
92-
libopen_pal_so_version=21:0:1
85+
libmpi_so_version=20:2:0
86+
libmpi_cxx_so_version=20:1:0
87+
libmpi_mpifh_so_version=21:0:1
88+
libmpi_usempi_tkr_so_version=21:0:1
89+
libmpi_usempi_ignore_tkr_so_version=21:0:1
90+
libmpi_usempif08_so_version=21:0:1
91+
92+
libopen_rte_so_version=21:0:1
93+
libopen_pal_so_version=22:0:2
9394
libmpi_java_so_version=20:1:0
94-
liboshmem_so_version=20:1:0
95+
liboshmem_so_version=20:2:0
9596
libompitrace_so_version=20:0:0
9697

9798
# "Common" components install standalone libraries that are run-time

contrib/dist/make-authors.pl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,13 @@ sub save {
147147
foreach my $p (@sorted_people) {
148148
print AUTHORS $p;
149149
if (exists($people->{$p}->{org})) {
150-
print AUTHORS ", $people->{$p}->{org}";
151-
152-
# Record this so that we can warn about it
153-
push(@people_with_unknown_orgs, $p)
154-
if ($people->{$p}->{org} eq $unknown_org);
150+
my $org = $people->{$p}->{org};
151+
if ($org ne $unknown_org) {
152+
print AUTHORS ", $org";
153+
} else {
154+
# Record this so that we can warn about it
155+
push(@people_with_unknown_orgs, $p);
156+
}
155157
}
156158
print AUTHORS "\n";
157159

0 commit comments

Comments
 (0)