[svn-r10791] Merge r10777 and r10779 from the mpich-3.0 branch.

CHANGES

@@ -15,11 +15,11 @@
  # Several other minor bug fixes, memory leak fixes, and code cleanup.
    A full list of changes is available using:
 
-     svn log -r10344:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich-3.0rc1
+     svn log -r10344:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich-3.0
 
      ... or at the following link:
 
-     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich-3.0rc1?action=follow_copy&rev=HEAD&stop_rev=10344&mode=follow_copy
+     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich-3.0?action=follow_copy&rev=HEAD&stop_rev=10344&mode=follow_copy
 
 
 ===============================================================================

maint/version.m4

@@ -14,7 +14,7 @@
 # changing this by playing with diversions, but then we would probably be
 # playing with autotools-fire.
 
-m4_define([MPICH_VERSION_m4],[3.0rc1])dnl
+m4_define([MPICH_VERSION_m4],[3.0])dnl
 m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 
 # For libtool ABI versioning rules see:
@@ -31,6 +31,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 #
 #     4. If any interfaces have been removed since the last public
 #     release, then set age to 0.
-m4_define([libmpich_so_version_m4],[9:0:0])dnl
+m4_define([libmpich_so_version_m4],[10:0:0])dnl
 
 [#] end of __file__

src/mpi/romio/version.m4

@@ -14,7 +14,7 @@
 # changing this by playing with diversions, but then we would probably be
 # playing with autotools-fire.
 
-m4_define([MPICH_VERSION_m4],[3.0rc1])dnl
+m4_define([MPICH_VERSION_m4],[3.0])dnl
 m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 
 # For libtool ABI versioning rules see:
@@ -31,6 +31,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 #
 #     4. If any interfaces have been removed since the last public
 #     release, then set age to 0.
-m4_define([libmpich_so_version_m4],[9:0:0])dnl
+m4_define([libmpich_so_version_m4],[10:0:0])dnl
 
 [#] end of __file__

src/pm/hydra/version.m4

@@ -14,7 +14,7 @@
 # changing this by playing with diversions, but then we would probably be
 # playing with autotools-fire.
 
-m4_define([MPICH_VERSION_m4],[3.0rc1])dnl
+m4_define([MPICH_VERSION_m4],[3.0])dnl
 m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 
 # For libtool ABI versioning rules see:
@@ -31,6 +31,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
 #
 #     4. If any interfaces have been removed since the last public
 #     release, then set age to 0.
-m4_define([libmpich_so_version_m4],[9:0:0])dnl
+m4_define([libmpich_so_version_m4],[10:0:0])dnl
 
 [#] end of __file__