From ca55ecd8121b370e77147e0b5660dd03a6b507c2 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Dec 2016 08:33:59 -0800 Subject: [PATCH 1/6] VERSION: Update shared library version numbers for v2.0.2 Fixes #2573 Signed-off-by: Jeff Squyres --- VERSION | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 7754346f3bc..323df98d8c0 100644 --- a/VERSION +++ b/VERSION @@ -82,16 +82,17 @@ date="Unreleased developer copy" # Version numbers are described in the Libtool current:revision:age # format. -libmpi_so_version=20:1:0 -libmpi_cxx_so_version=20:0:0 -libmpi_mpifh_so_version=20:0:0 -libmpi_usempi_tkr_so_version=20:0:0 -libmpi_usempi_ignore_tkr_so_version=20:0:0 -libmpi_usempif08_so_version=20:0:0 -libopen_rte_so_version=20:0:0 -libopen_pal_so_version=21:0:1 +libmpi_so_version=20:2:0 +libmpi_cxx_so_version=20:1:0 +libmpi_mpifh_so_version=21:0:1 +libmpi_usempi_tkr_so_version=21:0:1 +libmpi_usempi_ignore_tkr_so_version=21:0:1 +libmpi_usempif08_so_version=21:0:1 + +libopen_rte_so_version=21:0:1 +libopen_pal_so_version=22:0:2 libmpi_java_so_version=20:1:0 -liboshmem_so_version=20:1:0 +liboshmem_so_version=20:2:0 libompitrace_so_version=20:0:0 # "Common" components install standalone libraries that are run-time From f26e5d51bb2335d9ddd5412ba940df06a1afa145 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Dec 2016 10:07:13 -0800 Subject: [PATCH 2/6] VERSION: Bump to v2.0.2rc1 Signed-off-by: Jeff Squyres --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 323df98d8c0..23ee64a2672 100644 --- a/VERSION +++ b/VERSION @@ -24,7 +24,7 @@ release=2 # requirement is that it must be entirely printable ASCII characters # and have no white space. -greek=a1 +greek=rc1 # If repo_rev is empty, then the repository version number will be # obtained during "make dist" via the "git describe --tags --always" From 41920b7093e3bf95aadf3dfa17edb210910358e7 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Dec 2016 10:09:01 -0800 Subject: [PATCH 3/6] README: Update release date Signed-off-by: Jeff Squyres --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 24e6002032d..a41f73a2b49 100644 --- a/README +++ b/README @@ -59,7 +59,7 @@ Much, much more information is also available in the Open MPI FAQ: =========================================================================== The following abbreviated list of release notes applies to this code -base as of this writing (July 2016): +base as of this writing (December 2016): General notes ------------- From 1b28b03ea4a480aa261304db00f03b3c5784c17a Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Dec 2016 10:20:56 -0800 Subject: [PATCH 4/6] make-authors: we no longer require organizations Signed-off-by: Jeff Squyres (cherry picked from commit a28ae984ee7e4098026af8771c111f1f88e823ec) --- contrib/dist/make-authors.pl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/dist/make-authors.pl b/contrib/dist/make-authors.pl index 0ff69a0e3b5..925e83a9ca2 100755 --- a/contrib/dist/make-authors.pl +++ b/contrib/dist/make-authors.pl @@ -147,11 +147,13 @@ sub save { foreach my $p (@sorted_people) { print AUTHORS $p; if (exists($people->{$p}->{org})) { - print AUTHORS ", $people->{$p}->{org}"; - - # Record this so that we can warn about it - push(@people_with_unknown_orgs, $p) - if ($people->{$p}->{org} eq $unknown_org); + my $org = $people->{$p}->{org}; + if ($org ne $unknown_org) { + print AUTHORS ", $org"; + } else { + # Record this so that we can warn about it + push(@people_with_unknown_orgs, $p); + } } print AUTHORS "\n"; From 815420186cffe46fba0f46497daa4c2ffd8cb607 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Dec 2016 10:20:40 -0800 Subject: [PATCH 5/6] AUTHORS: Add all relevant AUTHORS for the v2.0.2 release Signed-off-by: Jeff Squyres --- AUTHORS | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 80c6e70c512..c4f9654ade0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,6 +12,8 @@ individual who committed them. Abhishek Kulkarni, Indiana University adkulkar@cs.indiana.edu +Aboorva Devarajan + abodevar@in.ibm.com, IBM Adrian Knoth, Friedrich-Schiller-Universitat Jena adi@minet.uni-jena.de Adrian Reber, Hochschule Esslingen @@ -94,6 +96,8 @@ Eugene Loh, Sun, Oracle Francois WELLENREITER, Individual francois.wellenreiter@atos.net wellen@free.fr +Gabriel Pichot + gabriel.pichot@gmail.com Galen Shipman, Los Alamos National Laboratory gshipman@lanl.gov Geoffrey Paulsen, IBM @@ -124,8 +128,8 @@ Howard Pritchard, Los Alamos National Laboratory Iain Bason, Sun, Oracle iain.bason@oracle.com Igor Ivanov, Mellanox - Igor.Ivanov@itseez.com igor.ivanov.va@gmail.com + igor.ivanov@itseez.com Igor Usarov, Mellanox igoru@mellanox.com Jeff Squyres, University of Indiana, Cisco @@ -142,6 +146,8 @@ Jose Roman, Universitat Politecnica de Valencia Josh Hursey, Indiana University, Oak Ridge National Laboratory, Los Alamos National Laboratory, Lawrence Berkeley National Laboratory, University of Wisconsin-La Crosse, IBM jhursey@us.ibm.com jjhursey@open-mpi.org +Joshua Gerrard + enquiries@joshuagerrard.com Joshua Ladd, Mellanox jladd.mlnx@gmail.com joshual@mellanox.com @@ -221,6 +227,8 @@ Pierre Lemarinier, University of Tennessee-Knoxville lemarini@icl.utk.edu Piotr Lesnicki, Bull piotr.lesnicki@ext.bull.net +Potnuri Bharat Teja, Chelsio + bharat@chelsio.com Prabhanjan Kambadur, Indiana University pkambadu@osl.iu.edu Rainer Keller, High Performance Computing Center, Stuttgart, Oak Ridge National Laboratory, Hochschule fuer Technik Stuttgart From c1cc08a5ec22b163551b93e863fa7db29214dc8c Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 14 Dec 2016 10:31:03 -0800 Subject: [PATCH 6/6] .mailmap: sync with master Signed-off-by: Jeff Squyres --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index c1929e9a297..c296874e490 100644 --- a/.mailmap +++ b/.mailmap @@ -60,6 +60,7 @@ Yohann Burette Yohann Burette MPI Team (bot) +MPI Team (bot) Yossi Itigin @@ -99,3 +100,5 @@ L. R. Rajeshnarayanan Aurélien Bouteiller + +Alex Mikheev