commits
Threads by month
- ----- 2026 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- 2054 discussions
r10787 - in mpich2/trunk: . doc/installguide doc/namepub doc/refman doc/userguide doc/windev maint src/mpi/romio src/mpi/romio/doc
by balaji＠mcs.anl.gov 19 Dec '12
by balaji＠mcs.anl.gov 19 Dec '12
19 Dec '12
Author: balaji
Date: 2012-12-19 23:02:00 -0600 (Wed, 19 Dec 2012)
New Revision: 10787
Modified:
mpich2/trunk/README.vin
mpich2/trunk/doc/installguide/install.tex.vin
mpich2/trunk/doc/namepub/namepub.tex
mpich2/trunk/doc/refman/mpiman.tex
mpich2/trunk/doc/userguide/user.tex.vin
mpich2/trunk/doc/windev/windev.tex.vin
mpich2/trunk/maint/docnotes
mpich2/trunk/src/mpi/romio/README
mpich2/trunk/src/mpi/romio/doc/source-guide.tex
mpich2/trunk/src/mpi/romio/doc/users-guide.tex
Log:
Fix instances where we say MPI-2, and use generic "MPI" where possible
so we don't have to keep correcting this. Also removed section
numbers from the MPI-2 standard that were referenced in the ROMIO
documents. If we feel that they are necessary, we can add them back
after the release.
No reviewer.
Modified: mpich2/trunk/README.vin
===================================================================
--- mpich2/trunk/README.vin 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/README.vin 2012-12-20 05:02:00 UTC (rev 10787)
@@ -185,10 +185,10 @@
process managers; the default is called Hydra.
Now we will run an MPI job, using the mpiexec command as specified
- in the MPI-2 standard. There are some examples in the install
+ in the MPI standard. There are some examples in the install
directory, which you have already put in your path, as well as in
- the directory mpich-%VERSION%/examples. One of them is the
- classic CPI example, which computes the value of pi by numerical
+ the directory mpich-%VERSION%/examples. One of them is the classic
+ CPI example, which computes the value of pi by numerical
integration in parallel.
To run the CPI example with 'n' processes on your local machine,
Modified: mpich2/trunk/doc/installguide/install.tex.vin
===================================================================
--- mpich2/trunk/doc/installguide/install.tex.vin 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/doc/installguide/install.tex.vin 2012-12-20 05:02:00 UTC (rev 10787)
@@ -101,7 +101,7 @@
\section{Introduction}
\label{sec:intro}
-This manual describes how to obtain and install MPICH, the MPI-2
+This manual describes how to obtain and install MPICH, the MPI
implementation from Argonne National Laboratory. (Of course, if you are
reading this, chances are good that you have already obtained it and
found this document, among others, in its \texttt{doc} subdirectory.)
@@ -324,7 +324,7 @@
\item
Now we will run an MPI job, using the \texttt{mpiexec} command as specified
-in the MPI-2 standard.
+in the MPI standard.
As part of the build process for MPICH, a simple program to compute the value
of $\pi$ by numerical integration is created in the
Modified: mpich2/trunk/doc/namepub/namepub.tex
===================================================================
--- mpich2/trunk/doc/namepub/namepub.tex 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/doc/namepub/namepub.tex 2012-12-20 05:02:00 UTC (rev 10787)
@@ -11,7 +11,7 @@
\section{Introduction}
-MPI-2 defines a set of routines for exchanging data with other MPI
+MPI defines a set of routines for exchanging data with other MPI
programs. The intent of these is to allow MPI applications to
exchange the data that is needed for the \code{port} argument in the
\code{MPI_Comm_connect} and \code{MPI_Comm_accept} calls.
@@ -84,7 +84,7 @@
handle so that the handle can be set to null when the free routine
succeeds. Each of these routines returns either \code{MPI_SUCCESS} or
a valid MPI error code; implementations may either use the MPICH
-error code mechanism or, for external packages, use the MPI-2 routines
+error code mechanism or, for external packages, use the MPI routines
for adding error codes and classes.
\begin{verbatim}
@@ -212,4 +212,4 @@
by this interface. The info key \code{NAMEPUB_CONTACT} can be used to
specify the directory into which the files will be placed.
-\end{document}
\ No newline at end of file
+\end{document}
Modified: mpich2/trunk/doc/refman/mpiman.tex
===================================================================
--- mpich2/trunk/doc/refman/mpiman.tex 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/doc/refman/mpiman.tex 2012-12-20 05:02:00 UTC (rev 10787)
@@ -61,7 +61,7 @@
\section{MPI routines}
This section contains descriptions of each of the routines in the MPI
-standard, including both MPI-1 and MPI-2.
+standard.
In the description of the routine parameters, the following terms are
used:
Modified: mpich2/trunk/doc/userguide/user.tex.vin
===================================================================
--- mpich2/trunk/doc/userguide/user.tex.vin 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/doc/userguide/user.tex.vin 2012-12-20 05:02:00 UTC (rev 10787)
@@ -92,12 +92,12 @@
\label{sec:migrating}
MPICH is a high-performance and widely portable implementation of the
-MPI Standard, designed to implement all of MPI-1 and MPI-2 (including
-dynamic process management, one-sided operations, parallel I/O, and
-other extensions). The \emph{MPICH Installer's Guide} provides some
-information on MPICH with respect to configuring and installing
-it. Details on compiling, linking, and running MPI programs are
-described below.
+MPI Standard, designed to implement all of MPI-1, MPI-2, and MPI-3
+(including dynamic process management, one-sided operations, parallel
+I/O, and other extensions). The \emph{MPICH Installer's Guide}
+provides some information on MPICH with respect to configuring and
+installing it. Details on compiling, linking, and running MPI programs
+are described below.
\subsection{Default Runtime Environment}
@@ -210,7 +210,7 @@
\end{small}
The problem is that both \texttt{stdio.h} and the MPI C++ interface use
\texttt{SEEK\_SET}, \texttt{SEEK\_CUR}, and \texttt{SEEK\_END}. This is really a bug
-in the MPI-2 standard. You can try adding
+in the MPI standard. You can try adding
\begin{verbatim}
#undef SEEK_SET
#undef SEEK_END
@@ -240,16 +240,16 @@
\section{Running Programs with \texttt{mpiexec}}
\label{sec:mpiexec}
-The MPI-2 Standard describes \texttt{mpiexec} as a suggested way to
-run MPI programs. MPICH implements the \texttt{mpiexec} standard, and
-also provides some extensions.
+The MPI Standard describes \texttt{mpiexec} as a suggested way to run
+MPI programs. MPICH implements the \texttt{mpiexec} standard, and also
+provides some extensions.
\subsection{Standard \texttt{mpiexec}}
\label{sec:mpiexec-standard}
-Here we describe the standard \texttt{mpiexec} arguments from the MPI-2
-Standard~\cite{mpi-forum:mpi2-journal}. The simplest form of a command
-to start an MPI job is
+Here we describe the standard \texttt{mpiexec} arguments from the MPI
+Standard~\cite{mpi-forum:mpi2-journal}. The simplest form of a
+command to start an MPI job is
\begin{verbatim}
mpiexec -f machinefile -n 32 a.out
@@ -272,7 +272,7 @@
\texttt{mpiexec}. This process will become an MPI process when it
calls \texttt{MPI\_Init}, and it may then call other MPI functions.
Currently, MPICH does not fully support calling the dynamic process
-routines from MPI-2 (e.g., \texttt{MPI\_Comm\_spawn} or
+routines from the MPI standard (e.g., \texttt{MPI\_Comm\_spawn} or
\texttt{MPI\_Comm\_accept}) from processes that are not started with
\texttt{mpiexec}.
@@ -306,7 +306,7 @@
\subsubsection{\texttt{mpiexec} arguments for SMPD}
\label{sec:mpiexec-smpd}
-\texttt{mpiexec} for smpd accepts the standard MPI-2 \texttt{mpiexec}
+\texttt{mpiexec} for smpd accepts the standard MPI \texttt{mpiexec}
options. Execute
\begin{verbatim}
mpiexec
@@ -676,10 +676,10 @@
\section{Other Tools Provided with MPICH}
\label{sec:other-tools}
-MPICH also includes a test suite for MPI-1 and MPI-2 functionality; this
-suite may be found in the \texttt{mpich/test/mpi} source directory and can be
-run with the command \texttt{make testing}. This test suite should work with
-any MPI implementation, not just MPICH.
+MPICH also includes a test suite for MPI functionality; this suite may
+be found in the \texttt{mpich/test/mpi} source directory and can be
+run with the command \texttt{make testing}. This test suite should
+work with any MPI implementation, not just MPICH.
\section{MPICH2 under Windows}
\label{sec:windows}
Modified: mpich2/trunk/doc/windev/windev.tex.vin
===================================================================
--- mpich2/trunk/doc/windev/windev.tex.vin 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/doc/windev/windev.tex.vin 2012-12-20 05:02:00 UTC (rev 10787)
@@ -694,7 +694,7 @@
specified there need not be any smpd process manager running on any of the nodes
used in the job. \texttt{mpiexec} provides the PMI interface and the remote
shell command is used to start the processes. Using these flags allows jobs to
-be started without any process managers running but the MPI-2 dynamic process
+be started without any process managers running but the MPI dynamic process
functions like MPI\_Comm\_spawn are consequently not available.
\item \texttt{-noprompt}
@@ -974,7 +974,7 @@
to set the variable to the hostname where the root process will be started instead
of the local host name.
-The limitation of this method of starting processes is that MPI-2 spawning operations
+The limitation of this method of starting processes is that MPI spawning operations
are not supported. If your application calls MPI\_Comm\_spawn it will produce
an error.
Modified: mpich2/trunk/maint/docnotes
===================================================================
--- mpich2/trunk/maint/docnotes 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/maint/docnotes 2012-12-20 05:02:00 UTC (rev 10787)
@@ -109,7 +109,7 @@
The sizes of MPI strings in Fortran are one less than the sizes of that
string in C/C++ because the C/C++ versions provide room for the trailing
null character required by C/C++. For example, 'MPI_MAX_ERROR_STRING' is
- 'mpif.h' is one smaller than the same value in 'mpi.h'. See the MPI-2
+ 'mpif.h' is one smaller than the same value in 'mpi.h'. See the MPI
standard, sections 2.6.2 and 4.12.9.
N*/
Modified: mpich2/trunk/src/mpi/romio/README
===================================================================
--- mpich2/trunk/src/mpi/romio/README 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/src/mpi/romio/README 2012-12-20 05:02:00 UTC (rev 10787)
@@ -161,9 +161,9 @@
Major Changes Version 1.0.2:
---------------------------
-* Implemented the shared file pointer functions (Section 9.4.4 of MPI-2) and
- split collective I/O functions (Section 9.4.5). Therefore, the main
- components of the MPI-2 I/O chapter not yet implemented are
+* Implemented the shared file pointer functions and
+ split collective I/O functions. Therefore, the main
+ components of the MPI I/O chapter not yet implemented are
file interoperability and error handling.
* Added support for using "direct I/O" on SGI's XFS file system.
@@ -298,13 +298,13 @@
-------------------
ROMIO is a high-performance, portable implementation of MPI-IO (the
-I/O chapter in MPI-2). ROMIO's home page is at
-http://www.mcs.anl.gov/romio . The MPI-2 standard is available at
+I/O chapter in MPI). ROMIO's home page is at
+http://www.mcs.anl.gov/romio . The MPI standard is available at
http://www.mpi-forum.org/docs/docs.html .
-This version of ROMIO includes everything defined in the MPI-2 I/O
-chapter except support for file interoperability (Sec. 9.5 of MPI-2) and
-user-defined error handlers for files (Sec. 4.13.3). The subarray and
+This version of ROMIO includes everything defined in the MPI I/O
+chapter except support for file interoperability and
+user-defined error handlers for files. The subarray and
distributed array datatype constructor functions from Chapter 4
(Sec. 4.14.4 & 4.14.5) have been implemented. They are useful for
accessing arrays stored in files. The functions MPI_File_f2c and
@@ -587,7 +587,7 @@
* If a Fortran program uses a file handle created using ROMIO's C
interface, or vice-versa, you must use the functions MPI_File_c2f
-or MPI_File_f2c (see MPI-2 Section 4.12.4). Such a situation occurs,
+or MPI_File_f2c. Such a situation occurs,
for example, if a Fortran program uses an I/O library written in C
with MPI-IO calls. Similar functions MPIO_Request_f2c and
MPIO_Request_c2f are also provided.
Modified: mpich2/trunk/src/mpi/romio/doc/source-guide.tex
===================================================================
--- mpich2/trunk/src/mpi/romio/doc/source-guide.tex 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/src/mpi/romio/doc/source-guide.tex 2012-12-20 05:02:00 UTC (rev 10787)
@@ -95,7 +95,7 @@
\begin{abstract}
\noindent
ROMIO is a high-performance, portable implementation of MPI-IO (the
-I/O chapter in \mbox{MPI-2}).
+I/O chapter in the \mbox{MPI Standard}).
This document describes the internals of the ROMIO implementation.
\end{abstract}
@@ -121,7 +121,7 @@
The ROMIO directory structure consists of two main branches, the MPI-IO branch
(mpi-io) and the ADIO branch (adio). The MPI-IO branch contains code that
-implements the functions defined in the MPI-2 specification for I/O, such as
+implements the functions defined in the MPI specification for I/O, such as
MPI\_File\_open. These functions are then written in terms of other functions
that provide an abstract interface to I/O resources, the ADIO functions.
There is an additional glue subdirectory in the MPI-IO branch that defines
@@ -369,7 +369,7 @@
value in a separate file...
Note that the ROMIO team has devised a portable method for implementing shared
-file pointers using only MPI-1 and MPI-2 functions. However, this method has
+file pointers using only MPI functions. However, this method has
not yet been implemented in ROMIO.
file name is selected at end of mpi-io/open.c.
Modified: mpich2/trunk/src/mpi/romio/doc/users-guide.tex
===================================================================
--- mpich2/trunk/src/mpi/romio/doc/users-guide.tex 2012-12-20 05:01:56 UTC (rev 10786)
+++ mpich2/trunk/src/mpi/romio/doc/users-guide.tex 2012-12-20 05:02:00 UTC (rev 10787)
@@ -94,7 +94,7 @@
\begin{abstract}
\noindent
ROMIO is a high-performance, portable implementation of MPI-IO (the
-I/O chapter in \mbox{MPI-2}). This document describes how to install and use
+I/O chapter in the \mbox{MPI Standard}). This document describes how to install and use
ROMIO version~1.2.4 on various machines.
\end{abstract}
@@ -102,7 +102,7 @@
ROMIO\footnote{\tt http://www.mcs.anl.gov/romio} is a
high-performance, portable implementation of MPI-IO (the I/O chapter in
-MPI-2~\cite{mpi97a}). This document describes how to install and use
+MPI~\cite{mpi97a}). This document describes how to install and use
ROMIO version~1.2.4 on various machines.
@@ -124,8 +124,8 @@
%
\section{General Information}
-This version of ROMIO includes everything defined in the MPI-2 I/O
-chapter except support for file interoperability (\S~9.5 of MPI-2) and
+This version of ROMIO includes everything defined in the MPI I/O
+chapter except support for file interoperability and
user-defined error handlers for files (\S~4.13.3). The subarray and
distributed array datatype constructor functions from Chapter 4
(\S~4.14.4 \& \S~4.14.5) have been implemented. They are useful for
@@ -324,7 +324,7 @@
the hint is only recognized at \texttt{MPI\_File\_open} time.
The set of hints used with a file is available through the routine
-\texttt{MPI\_File\_get\_info}, as documented in the MPI-2 standard.
+\texttt{MPI\_File\_get\_info}, as documented in the MPI standard.
As an additional feature in the ROMIO implementation, wildcards will
be expanded to indicate the precise configuration used with the file,
with the hostnames in the rank order used for the collective buffering
@@ -654,7 +654,7 @@
\subsection{ROMIO and {\tt MPI\_FILE\_SYNC}}
-The MPI-2 specification notes that a call to {\tt MPI\_FILE\_SYNC} ``causes
+The MPI specification notes that a call to {\tt MPI\_FILE\_SYNC} ``causes
all previous writes to {\tt fh} by the calling process to be transferred to
the storage device.'' Likewise, calls to {\tt MPI\_FILE\_CLOSE} have this
same semantic. Further, ``if all processes have made updates to the storage
@@ -1002,9 +1002,9 @@
\subsection{Major Changes in Version 1.0.2}
\begin{itemize}
-\item Implemented the shared file pointer functions (\S~9.4.4 of MPI-2) and
- split collective I/O functions (\S~9.4.5). Therefore, the main
- components of the MPI-2 I/O chapter not yet implemented are
+\item Implemented the shared file pointer functions and
+ split collective I/O functions. Therefore, the main
+ components of the MPI I/O chapter not yet implemented are
file interoperability and error handling.
\item Added support for using ``direct I/O'' on SGI's XFS file system.
1
0
Author: balaji
Date: 2012-12-19 23:01:56 -0600 (Wed, 19 Dec 2012)
New Revision: 10786
Modified:
mpich2/trunk/RELEASE_NOTES
Log:
There's no MPI C++ bindings anymore.
No reviewer.
Modified: mpich2/trunk/RELEASE_NOTES
===================================================================
--- mpich2/trunk/RELEASE_NOTES 2012-12-20 04:44:46 UTC (rev 10785)
+++ mpich2/trunk/RELEASE_NOTES 2012-12-20 05:01:56 UTC (rev 10786)
@@ -93,8 +93,5 @@
* The MPI datatypes corresponding to Fortran datatypes are not
available (e.g., no MPI::DOUBLE_PRECISION).
- * The C++ binding does not implement a separate profiling interface,
- as allowed by the MPI-2 Standard (Section 10.1.10 Profiling).
-
* MPI::ERRORS_RETURN may still throw exceptions in the event of an
error rather than silently returning.
1
0
Author: balaji
Date: 2012-12-19 22:44:46 -0600 (Wed, 19 Dec 2012)
New Revision: 10785
Modified:
mpich2/branches/release/mpich-3.0/
mpich2/branches/release/mpich-3.0/README.vin
mpich2/branches/release/mpich-3.0/confdb/
mpich2/branches/release/mpich-3.0/confdb/aclocal_util.m4
mpich2/branches/release/mpich-3.0/maint/version.m4
mpich2/branches/release/mpich-3.0/src/mpi/romio/
mpich2/branches/release/mpich-3.0/src/mpi/romio/.codingcheck
mpich2/branches/release/mpich-3.0/src/mpi/romio/.config_params
mpich2/branches/release/mpich-3.0/src/mpi/romio/COPYRIGHT
mpich2/branches/release/mpich-3.0/src/mpi/romio/Makefile.am
mpich2/branches/release/mpich-3.0/src/mpi/romio/README
mpich2/branches/release/mpich-3.0/src/mpi/romio/adio/
mpich2/branches/release/mpich-3.0/src/mpi/romio/autogen.sh
mpich2/branches/release/mpich-3.0/src/mpi/romio/common/
mpich2/branches/release/mpich-3.0/src/mpi/romio/configure.ac
mpich2/branches/release/mpich-3.0/src/mpi/romio/doc/
mpich2/branches/release/mpich-3.0/src/mpi/romio/include/
mpich2/branches/release/mpich-3.0/src/mpi/romio/localdefs.in
mpich2/branches/release/mpich-3.0/src/mpi/romio/mpi-io/
mpich2/branches/release/mpich-3.0/src/mpi/romio/mpi2-other/
mpich2/branches/release/mpich-3.0/src/mpi/romio/test-internal/
mpich2/branches/release/mpich-3.0/src/mpi/romio/test/
mpich2/branches/release/mpich-3.0/src/mpi/romio/util/
mpich2/branches/release/mpich-3.0/src/mpid/
mpich2/branches/release/mpich-3.0/src/mpid/ch3/channels/nemesis/netmod/portals4/
mpich2/branches/release/mpich-3.0/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c
mpich2/branches/release/mpich-3.0/src/mpl/src/mplstr.c
mpich2/branches/release/mpich-3.0/src/pm/hydra/
mpich2/branches/release/mpich-3.0/src/pm/hydra/Makefile.am
mpich2/branches/release/mpich-3.0/src/pm/hydra/README
mpich2/branches/release/mpich-3.0/src/pm/hydra/autogen.sh
mpich2/branches/release/mpich-3.0/src/pm/hydra/configure.ac
mpich2/branches/release/mpich-3.0/src/pm/hydra/examples/
mpich2/branches/release/mpich-3.0/src/pm/hydra/hydra-doxygen.cfg.in
mpich2/branches/release/mpich-3.0/src/pm/hydra/include/
mpich2/branches/release/mpich-3.0/src/pm/hydra/mpichprereq
mpich2/branches/release/mpich-3.0/src/pm/hydra/pm/
mpich2/branches/release/mpich-3.0/src/pm/hydra/tools/
mpich2/branches/release/mpich-3.0/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
mpich2/branches/release/mpich-3.0/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
mpich2/branches/release/mpich-3.0/src/pm/hydra/ui/
mpich2/branches/release/mpich-3.0/src/pm/hydra/utils/
mpich2/branches/release/mpich-3.0/winconfigure.wsf
Log:
Merge r10784 from trunk.
Property changes on: mpich2/branches/release/mpich-3.0
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/groupfailed:9231
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/nem-squash:9995-9998
/mpich2/branches/dev/reenableas:9355
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/groupfailed:9231
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/nem-squash:9995-9998
/mpich2/branches/dev/reenableas:9355
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
/mpich2/trunk:10784
Modified: mpich2/branches/release/mpich-3.0/README.vin
===================================================================
--- mpich2/branches/release/mpich-3.0/README.vin 2012-12-20 04:42:41 UTC (rev 10784)
+++ mpich2/branches/release/mpich-3.0/README.vin 2012-12-20 04:44:46 UTC (rev 10785)
@@ -1,8 +1,8 @@
MPICH Release %VERSION%
MPICH is a high-performance and widely portable implementation of the
-MPI-2.2 standard from the Argonne National Laboratory. This release
-has all MPI 2.2 functions and features required by the standard with
+MPI-3.0 standard from the Argonne National Laboratory. This release
+has all MPI 3.0 functions and features required by the standard with
the exception of support for the "external32" portable I/O format and
user-defined data representations for I/O.
Property changes on: mpich2/branches/release/mpich-3.0/confdb
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/groupfailed/confdb:9231
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/nem-squash/confdb:9995-9998
/mpich2/branches/dev/reenableas/confdb:9355
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
+ /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb:7771-7802
/mpich2/branches/dev/error-return/confdb:7662-7670
/mpich2/branches/dev/ftb/confdb:5661-5730
/mpich2/branches/dev/groupfailed/confdb:9231
/mpich2/branches/dev/lapi/confdb:5817
/mpich2/branches/dev/nem-squash/confdb:9995-9998
/mpich2/branches/dev/reenableas/confdb:9355
/mpich2/branches/dev/wintcp_async_progress/confdb:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb:5406
/mpich2/trunk/confdb:10784
Property changes on: mpich2/branches/release/mpich-3.0/confdb/aclocal_util.m4
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/confdb/aclocal_util.m4:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb/aclocal_util.m4:7771-7802
/mpich2/branches/dev/error-return/confdb/aclocal_util.m4:7662-7670
/mpich2/branches/dev/ftb/confdb/aclocal_util.m4:5661-5730
/mpich2/branches/dev/groupfailed/confdb/aclocal_util.m4:9231
/mpich2/branches/dev/lapi/confdb/aclocal_util.m4:5817
/mpich2/branches/dev/nem-squash/confdb/aclocal_util.m4:9995-9998
/mpich2/branches/dev/reenableas/src/mpe2/src/slog2sdk/aclocal_util.m4:9355
/mpich2/branches/dev/wintcp_async_progress/confdb/aclocal_util.m4:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb/aclocal_util.m4:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb/aclocal_util.m4:5406
+ /mpich2/branches/dev/ckpt2/confdb/aclocal_util.m4:5180,5182,5196,5198
/mpich2/branches/dev/coll-err-ret/confdb/aclocal_util.m4:7771-7802
/mpich2/branches/dev/error-return/confdb/aclocal_util.m4:7662-7670
/mpich2/branches/dev/ftb/confdb/aclocal_util.m4:5661-5730
/mpich2/branches/dev/groupfailed/confdb/aclocal_util.m4:9231
/mpich2/branches/dev/lapi/confdb/aclocal_util.m4:5817
/mpich2/branches/dev/nem-squash/confdb/aclocal_util.m4:9995-9998
/mpich2/branches/dev/reenableas/src/mpe2/src/slog2sdk/aclocal_util.m4:9355
/mpich2/branches/dev/wintcp_async_progress/confdb/aclocal_util.m4:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/confdb/aclocal_util.m4:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/confdb/aclocal_util.m4:5406
/mpich2/trunk/confdb/aclocal_util.m4:10784
Property changes on: mpich2/branches/release/mpich-3.0/maint/version.m4
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/maint/version.m4:5050
/mpich2/branches/dev/ckpt2/maint/version.m4:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/version.m4:7771-7802
/mpich2/branches/dev/error-return/maint/version.m4:7662-7670
/mpich2/branches/dev/ftb/maint/version.m4:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/version.m4:9231
/mpich2/branches/dev/lapi/maint/version.m4:5817
/mpich2/branches/dev/nem-squash/maint/version.m4:9995-9998
/mpich2/branches/dev/reenableas/maint/version.m4:9355
/mpich2/branches/dev/wintcp_async_progress/maint/version.m4:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/version.m4:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/version.m4:5406
+ /mpich2/branches/dev/ckpt/maint/version.m4:5050
/mpich2/branches/dev/ckpt2/maint/version.m4:5057-6537
/mpich2/branches/dev/coll-err-ret/maint/version.m4:7771-7802
/mpich2/branches/dev/error-return/maint/version.m4:7662-7670
/mpich2/branches/dev/ftb/maint/version.m4:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/version.m4:9231
/mpich2/branches/dev/lapi/maint/version.m4:5817
/mpich2/branches/dev/nem-squash/maint/version.m4:9995-9998
/mpich2/branches/dev/reenableas/maint/version.m4:9355
/mpich2/branches/dev/wintcp_async_progress/maint/version.m4:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/maint/version.m4:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/maint/version.m4:5406
/mpich2/trunk/maint/version.m4:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio:9231*
/mpich2/branches/dev/lapi/src/mpi/romio:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio:9355*
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio:9231*
/mpich2/branches/dev/lapi/src/mpi/romio:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio:9355*
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio:5406
/mpich2/trunk/src/mpi/romio:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/.codingcheck
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/.codingcheck:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/.codingcheck:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/.codingcheck:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/.codingcheck:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/.codingcheck:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/.codingcheck:9231
/mpich2/branches/dev/lapi/src/mpi/romio/.codingcheck:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/.codingcheck:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/.codingcheck:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/.codingcheck:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/.codingcheck:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/.codingcheck:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/.codingcheck:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/.codingcheck:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/.codingcheck:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/.codingcheck:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/.codingcheck:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/.codingcheck:9231
/mpich2/branches/dev/lapi/src/mpi/romio/.codingcheck:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/.codingcheck:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/.codingcheck:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/.codingcheck:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/.codingcheck:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/.codingcheck:5406
/mpich2/trunk/src/mpi/romio/.codingcheck:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/.config_params
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/.config_params:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/.config_params:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/.config_params:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/.config_params:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/.config_params:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/.config_params:9231
/mpich2/branches/dev/lapi/src/mpi/romio/.config_params:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/.config_params:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/.config_params:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/.config_params:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/.config_params:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/.config_params:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/.config_params:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/.config_params:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/.config_params:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/.config_params:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/.config_params:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/.config_params:9231
/mpich2/branches/dev/lapi/src/mpi/romio/.config_params:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/.config_params:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/.config_params:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/.config_params:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/.config_params:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/.config_params:5406
/mpich2/trunk/src/mpi/romio/.config_params:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/COPYRIGHT
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/COPYRIGHT:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/COPYRIGHT:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/COPYRIGHT:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/COPYRIGHT:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/COPYRIGHT:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/COPYRIGHT:9231
/mpich2/branches/dev/lapi/src/mpi/romio/COPYRIGHT:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/COPYRIGHT:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/COPYRIGHT:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/COPYRIGHT:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/COPYRIGHT:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/COPYRIGHT:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/COPYRIGHT:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/COPYRIGHT:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/COPYRIGHT:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/COPYRIGHT:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/COPYRIGHT:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/COPYRIGHT:9231
/mpich2/branches/dev/lapi/src/mpi/romio/COPYRIGHT:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/COPYRIGHT:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/COPYRIGHT:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/COPYRIGHT:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/COPYRIGHT:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/COPYRIGHT:5406
/mpich2/trunk/src/mpi/romio/COPYRIGHT:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/Makefile.am
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/Makefile.am:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/Makefile.am:9231
/mpich2/branches/dev/lapi/src/mpi/romio/Makefile.am:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/Makefile.am:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/Makefile.am:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/Makefile.am:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/Makefile.am:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/Makefile.am:9231
/mpich2/branches/dev/lapi/src/mpi/romio/Makefile.am:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/Makefile.am:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/Makefile.am:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/Makefile.am:5406
/mpich2/trunk/src/mpi/romio/Makefile.am:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/README
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/README:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/README:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/README:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/README:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/README:9231
/mpich2/branches/dev/lapi/src/mpi/romio/README:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/README:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/README:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/README:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/README:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/README:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/README:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/README:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/README:9231
/mpich2/branches/dev/lapi/src/mpi/romio/README:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/README:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/README:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/README:5406
/mpich2/trunk/src/mpi/romio/README:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/adio
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/adio:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/adio:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/adio:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/adio:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/adio:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/adio:9231
/mpich2/branches/dev/lapi/src/mpi/romio/adio:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/adio:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/adio:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/adio:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/adio:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/adio:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/adio:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/adio:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/adio:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/adio:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/adio:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/adio:9231
/mpich2/branches/dev/lapi/src/mpi/romio/adio:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/adio:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/adio:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/adio:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/adio:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/adio:5406
/mpich2/trunk/src/mpi/romio/adio:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/autogen.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/autogen.sh:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/autogen.sh:9231
/mpich2/branches/dev/lapi/src/mpi/romio/autogen.sh:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/autogen.sh:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/autogen.sh:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/autogen.sh:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/autogen.sh:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/autogen.sh:9231
/mpich2/branches/dev/lapi/src/mpi/romio/autogen.sh:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/autogen.sh:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/autogen.sh:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/autogen.sh:5406
/mpich2/trunk/src/mpi/romio/autogen.sh:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/common
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/common:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/common:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/common:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/common:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/common:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/common:9231
/mpich2/branches/dev/lapi/src/mpi/romio/common:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/common:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/common:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/common:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/common:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/common:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/common:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/common:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/common:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/common:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/common:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/common:9231
/mpich2/branches/dev/lapi/src/mpi/romio/common:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/common:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/common:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/common:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/common:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/common:5406
/mpich2/trunk/src/mpi/romio/common:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/configure.in:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/configure.in:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/configure.in:9231
/mpich2/branches/dev/lapi/src/mpi/romio/configure.in:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/configure.ac:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/configure.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/configure.in:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/configure.in:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/configure.in:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/configure.in:9231
/mpich2/branches/dev/lapi/src/mpi/romio/configure.in:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/configure.ac:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/configure.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/configure.in:5406
/mpich2/trunk/src/mpi/romio/configure.ac:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/doc
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/doc:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/doc:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/doc:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/doc:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/doc:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/doc:9231
/mpich2/branches/dev/lapi/src/mpi/romio/doc:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/doc:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/doc:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/doc:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/doc:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/doc:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/doc:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/doc:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/doc:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/doc:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/doc:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/doc:9231
/mpich2/branches/dev/lapi/src/mpi/romio/doc:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/doc:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/doc:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/doc:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/doc:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/doc:5406
/mpich2/trunk/src/mpi/romio/doc:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/include
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/include:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/include:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/include:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/include:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/include:9231
/mpich2/branches/dev/lapi/src/mpi/romio/include:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/include:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/include:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/include:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/include:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/include:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/include:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/include:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/include:9231
/mpich2/branches/dev/lapi/src/mpi/romio/include:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/include:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/include:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/include:5406
/mpich2/trunk/src/mpi/romio/include:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/localdefs.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/localdefs.in:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/localdefs.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/localdefs.in:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/localdefs.in:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/localdefs.in:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/localdefs.in:9231
/mpich2/branches/dev/lapi/src/mpi/romio/localdefs.in:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/localdefs.in:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/localdefs.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/localdefs.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/localdefs.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/localdefs.in:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/localdefs.in:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/localdefs.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/localdefs.in:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/localdefs.in:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/localdefs.in:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/localdefs.in:9231
/mpich2/branches/dev/lapi/src/mpi/romio/localdefs.in:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/localdefs.in:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/localdefs.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/localdefs.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/localdefs.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/localdefs.in:5406
/mpich2/trunk/src/mpi/romio/localdefs.in:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/mpi-io
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/mpi-io:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/mpi-io:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/mpi-io:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/mpi-io:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/mpi-io:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/mpi-io:9231
/mpich2/branches/dev/lapi/src/mpi/romio/mpi-io:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/mpi-io:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/mpi-io:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/mpi-io:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/mpi-io:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/mpi-io:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/mpi-io:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/mpi-io:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/mpi-io:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/mpi-io:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/mpi-io:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/mpi-io:9231
/mpich2/branches/dev/lapi/src/mpi/romio/mpi-io:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/mpi-io:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/mpi-io:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/mpi-io:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/mpi-io:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/mpi-io:5406
/mpich2/trunk/src/mpi/romio/mpi-io:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/mpi2-other
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/mpi2-other:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/mpi2-other:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/mpi2-other:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/mpi2-other:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/mpi2-other:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/mpi2-other:9231
/mpich2/branches/dev/lapi/src/mpi/romio/mpi2-other:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/mpi2-other:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/mpi2-other:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/mpi2-other:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/mpi2-other:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/mpi2-other:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/mpi2-other:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/mpi2-other:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/mpi2-other:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/mpi2-other:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/mpi2-other:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/mpi2-other:9231
/mpich2/branches/dev/lapi/src/mpi/romio/mpi2-other:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/mpi2-other:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/mpi2-other:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/mpi2-other:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/mpi2-other:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/mpi2-other:5406
/mpich2/trunk/src/mpi/romio/mpi2-other:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/test
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/test:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/test:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/test:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/test:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/test:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/test:9231
/mpich2/branches/dev/lapi/src/mpi/romio/test:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/test:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/test:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/test:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/test:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/test:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/test:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/test:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/test:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/test:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/test:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/test:9231
/mpich2/branches/dev/lapi/src/mpi/romio/test:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/test:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/test:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/test:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/test:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/test:5406
/mpich2/trunk/src/mpi/romio/test:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/test-internal
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/test-internal:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/test-internal:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/test-internal:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/test-internal:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/test-internal:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/test-internal:9231
/mpich2/branches/dev/lapi/src/mpi/romio/test-internal:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/test-internal:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/test-internal:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/test-internal:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/test-internal:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/test-internal:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/test-internal:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/test-internal:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/test-internal:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/test-internal:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/test-internal:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/test-internal:9231
/mpich2/branches/dev/lapi/src/mpi/romio/test-internal:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/test-internal:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/test-internal:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/test-internal:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/test-internal:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/test-internal:5406
/mpich2/trunk/src/mpi/romio/test-internal:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpi/romio/util
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpi/romio/util:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/util:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/util:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/util:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/util:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/util:9231
/mpich2/branches/dev/lapi/src/mpi/romio/util:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/util:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/util:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/util:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/util:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/util:5406
+ /mpich2/branches/dev/ckpt/src/mpi/romio/util:5050
/mpich2/branches/dev/ckpt2/src/mpi/romio/util:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpi/romio/util:7771-7802
/mpich2/branches/dev/error-return/src/mpi/romio/util:7662-7670
/mpich2/branches/dev/ftb/src/mpi/romio/util:5661-5730
/mpich2/branches/dev/groupfailed/src/mpi/romio/util:9231
/mpich2/branches/dev/lapi/src/mpi/romio/util:5817
/mpich2/branches/dev/nem-squash/src/mpi/romio/util:9995-9998
/mpich2/branches/dev/reenableas/src/mpi/romio/util:9355
/mpich2/branches/dev/wintcp_async_progress/src/mpi/romio/util:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpi/romio/util:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpi/romio/util:5406
/mpich2/trunk/src/mpi/romio/util:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpid
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/groupfailed/src/mpid:9231
/mpich2/branches/dev/nem-squash/src/mpid:9995-9998
/mpich2/branches/dev/reenableas/src/mpid:9355
+ /mpich2/branches/dev/coll-err-ret/src/mpid:7771-7802
/mpich2/branches/dev/error-return/src/mpid:7405-7603,7662-7670
/mpich2/branches/dev/groupfailed/src/mpid:9231
/mpich2/branches/dev/nem-squash/src/mpid:9995-9998
/mpich2/branches/dev/reenableas/src/mpid:9355
/mpich2/trunk/src/mpid:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpid/ch3/channels/nemesis/netmod/portals4
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:7405-7603,7662-7670
/mpich2/branches/dev/groupfailed/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:9231
/mpich2/branches/dev/reenableas/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:9355
+ /mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:7405-7603,7662-7670
/mpich2/branches/dev/groupfailed/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:9231
/mpich2/branches/dev/reenableas/src/mpid/ch3/channels/nemesis/nemesis/netmod/portals4nm:9355
/mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/portals4:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/groupfailed/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:9231
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/reenableas/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:9355
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:8275
+ /mpich2/branches/dev/ckpt/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5050
/mpich2/branches/dev/ckpt2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5057-6537
/mpich2/branches/dev/coll-err-ret/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7771-7802
/mpich2/branches/dev/error-return/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:7405-7603,7662-7670
/mpich2/branches/dev/ftb/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5661-5730
/mpich2/branches/dev/groupfailed/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:9231
/mpich2/branches/dev/lapi/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5817
/mpich2/branches/dev/reenableas/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:9355
/mpich2/branches/dev/win_rrvm/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:6416,6428
/mpich2/branches/dev/wintcp_async_progress/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:5406
/mpich2/trunk/src/mpid/ch3/channels/nemesis/nemesis/netmod/wintcp/socksm.c:8275
/mpich2/trunk/src/mpid/ch3/channels/nemesis/netmod/wintcp/socksm.c:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/mpl/src/mplstr.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/groupfailed/src/mpl/src/mplstr.c:9231
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/dev/nem-squash/src/mpl/src/mplstr.c:9995-9998
/mpich2/branches/dev/reenableas/src/mpl/src/mplstr.c:9355
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
+ /mpich2/branches/dev/ckpt2/src/mpl/src/string/mplstr.c:5182,5196,5198
/mpich2/branches/dev/coll-err-ret/src/mpl/src/mplstr.c:7771-7802
/mpich2/branches/dev/error-return/src/mpl/src/mplstr.c:7662-7670
/mpich2/branches/dev/ftb/src/mpl/src/mplstr.c:5661-5730
/mpich2/branches/dev/groupfailed/src/mpl/src/mplstr.c:9231
/mpich2/branches/dev/lapi/src/mpl/src/mplstr.c:5817
/mpich2/branches/dev/nem-squash/src/mpl/src/mplstr.c:9995-9998
/mpich2/branches/dev/reenableas/src/mpl/src/mplstr.c:9355
/mpich2/branches/release/mpich2-1.1.1/src/mpl/src/string/mplstr.c:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/mpl/src/string/mplstr.c:5406
/mpich2/trunk/src/mpl/src/mplstr.c:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra:7771-7802*
/mpich2/branches/dev/error-return/src/pm/hydra:7662-7670*
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra:9231*
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra:9355*
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra:7771-7802*
/mpich2/branches/dev/error-return/src/pm/hydra:7662-7670*
/mpich2/branches/dev/ftb/src/pm/hydra:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra:9231*
/mpich2/branches/dev/lapi/src/pm/hydra:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra:9355*
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra:5406
/mpich2/trunk/src/pm/hydra:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/Makefile.am
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/Makefile.am:9231
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/Makefile.am:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/Makefile.am:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/Makefile.am:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/Makefile.am:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/Makefile.am:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/Makefile.am:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/Makefile.am:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/Makefile.am:9231
/mpich2/branches/dev/lapi/src/pm/hydra/Makefile.am:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/Makefile.am:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/Makefile.am:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/Makefile.am:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/Makefile.am:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/Makefile.am:5406
/mpich2/trunk/src/pm/hydra/Makefile.am:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/README
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/README:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/README:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/README:9231
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/README:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/README:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/README:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/README:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/README:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/README:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/README:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/README:9231
/mpich2/branches/dev/lapi/src/pm/hydra/README:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/README:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/README:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/README:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/README:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/README:5406
/mpich2/trunk/src/pm/hydra/README:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/autogen.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/autogen.sh:9231
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/autogen.sh:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/autogen.sh:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/autogen.sh:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/autogen.sh:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/autogen.sh:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/autogen.sh:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/autogen.sh:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/autogen.sh:9231
/mpich2/branches/dev/lapi/src/pm/hydra/autogen.sh:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/autogen.sh:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/autogen.sh:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/autogen.sh:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/autogen.sh:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/autogen.sh:5406
/mpich2/trunk/src/pm/hydra/autogen.sh:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/configure.ac
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/configure.in:9231
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/configure.ac:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/configure.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/configure.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/configure.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/configure.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/configure.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/configure.in:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/configure.in:9231
/mpich2/branches/dev/lapi/src/pm/hydra/configure.in:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/configure.ac:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/configure.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/configure.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/configure.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/configure.in:5406
/mpich2/trunk/src/pm/hydra/configure.ac:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/examples
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/examples:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/examples:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/examples:9231
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/examples:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/examples:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/examples:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/examples:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/examples:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/examples:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/examples:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/examples:9231
/mpich2/branches/dev/lapi/src/pm/hydra/examples:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/examples:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/examples:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/examples:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/examples:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/examples:5406
/mpich2/trunk/src/pm/hydra/examples:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/hydra-doxygen.cfg.in
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/hydra-doxygen.cfg.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/hydra-doxygen.cfg.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/hydra-doxygen.cfg.in:9231
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/hydra-doxygen.cfg.in:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/hydra-doxygen.cfg.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/hydra-doxygen.cfg.in:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/hydra-doxygen.cfg.in:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/hydra-doxygen.cfg.in:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/hydra-doxygen.cfg.in:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/hydra-doxygen.cfg.in:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/hydra-doxygen.cfg.in:9231
/mpich2/branches/dev/lapi/src/pm/hydra/hydra-doxygen.cfg.in:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/hydra-doxygen.cfg.in:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/hydra-doxygen.cfg.in:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/hydra-doxygen.cfg.in:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/hydra-doxygen.cfg.in:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/hydra-doxygen.cfg.in:5406
/mpich2/trunk/src/pm/hydra/hydra-doxygen.cfg.in:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/include
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/include:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/include:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/include:9231
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/include:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/include:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/include:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/include:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/include:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/include:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/include:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/include:9231
/mpich2/branches/dev/lapi/src/pm/hydra/include:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/include:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/include:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/include:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/include:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/include:5406
/mpich2/trunk/src/pm/hydra/include:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/mpichprereq
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/mpich2prereq:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/mpich2prereq:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/mpich2prereq:9231
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/mpich2prereq:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/mpich2prereq:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/mpich2prereq:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/mpich2prereq:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/mpich2prereq:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/mpich2prereq:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/mpich2prereq:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/mpich2prereq:9231
/mpich2/branches/dev/lapi/src/pm/hydra/mpich2prereq:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/mpich2prereq:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/mpich2prereq:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/mpich2prereq:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/mpich2prereq:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/mpich2prereq:5406
/mpich2/trunk/src/pm/hydra/mpichprereq:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/pm
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/pm:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/pm:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/pm:9231
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/pm:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/pm:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/pm:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/pm:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/pm:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/pm:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/pm:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/pm:9231
/mpich2/branches/dev/lapi/src/pm/hydra/pm:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/pm:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/pm:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/pm:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/pm:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/pm:5406
/mpich2/trunk/src/pm/hydra/pm:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/tools
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/tools:9231
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/tools:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/tools:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/tools:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/tools:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/tools:9231
/mpich2/branches/dev/lapi/src/pm/hydra/tools:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/tools:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/tools:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/tools:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/tools:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/tools:5406
/mpich2/trunk/src/pm/hydra/tools:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:9231
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:9355
+ /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:9231
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/slurm/slurm_query_proxy_id.c:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:9355
/mpich2/trunk/src/pm/hydra/tools/bootstrap/external/slurm_query_proxy_id.c:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:9231
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:9355
+ /mpich2/branches/dev/coll-err-ret/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:9231
/mpich2/branches/dev/lapi/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:9355
/mpich2/trunk/src/pm/hydra/tools/bootstrap/src/bsci_query_proxy_id.c:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/ui
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/ui:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/ui:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/ui:9231
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/ui:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/ui:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/ui:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/ui:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/ui:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/ui:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/ui:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/ui:9231
/mpich2/branches/dev/lapi/src/pm/hydra/ui:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/ui:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/ui:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/ui:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/ui:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/ui:5406
/mpich2/trunk/src/pm/hydra/ui:10784
Property changes on: mpich2/branches/release/mpich-3.0/src/pm/hydra/utils
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/utils:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/utils:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/utils:9231
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/utils:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/utils:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
+ /mpich2/branches/dev/ckpt/src/pm/hydra/utils:5050
/mpich2/branches/dev/ckpt2/src/pm/hydra/utils:5057-6537
/mpich2/branches/dev/coll-err-ret/src/pm/hydra/utils:7771-7802
/mpich2/branches/dev/error-return/src/pm/hydra/utils:7662-7670
/mpich2/branches/dev/ftb/src/pm/hydra/utils:5661-5730
/mpich2/branches/dev/groupfailed/src/pm/hydra/utils:9231
/mpich2/branches/dev/lapi/src/pm/hydra/utils:5817
/mpich2/branches/dev/nem-squash/src/pm/hydra/utils:9995-9998
/mpich2/branches/dev/reenableas/src/pm/hydra/utils:9355
/mpich2/branches/dev/wintcp_async_progress/src/pm/hydra/utils:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/src/pm/hydra/utils:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/src/pm/hydra/utils:5406
/mpich2/trunk/src/pm/hydra/utils:10784
Property changes on: mpich2/branches/release/mpich-3.0/winconfigure.wsf
___________________________________________________________________
Modified: svn:mergeinfo
- /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/coll-err-ret/winconfigure.wsf:7771-7802
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/groupfailed/winconfigure.wsf:9231
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/nem-squash/winconfigure.wsf:9995-9998
/mpich2/branches/dev/reenableas/winconfigure.wsf:9355
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
+ /mpich2/branches/dev/ckpt/winconfigure.wsf:5050
/mpich2/branches/dev/ckpt2/winconfigure.wsf:5057-6537
/mpich2/branches/dev/coll-err-ret/winconfigure.wsf:7771-7802
/mpich2/branches/dev/error-return/winconfigure.wsf:7662-7670
/mpich2/branches/dev/ftb/winconfigure.wsf:5661-5730
/mpich2/branches/dev/groupfailed/winconfigure.wsf:9231
/mpich2/branches/dev/lapi/winconfigure.wsf:5817
/mpich2/branches/dev/nem-squash/winconfigure.wsf:9995-9998
/mpich2/branches/dev/reenableas/winconfigure.wsf:9355
/mpich2/branches/dev/win_rrvm/winconfigure.wsf:6404,6407-6408,6420,6422-6423
/mpich2/branches/dev/wintcp_async_progress/winconfigure.wsf:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1/winconfigure.wsf:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2/winconfigure.wsf:5406
/mpich2/trunk/winconfigure.wsf:10784
1
0
Author: balaji
Date: 2012-12-19 22:42:41 -0600 (Wed, 19 Dec 2012)
New Revision: 10784
Modified:
mpich2/trunk/README.vin
Log:
Fix README to say that we provide MPI-3.0.
No reviewer.
Modified: mpich2/trunk/README.vin
===================================================================
--- mpich2/trunk/README.vin 2012-12-20 04:32:42 UTC (rev 10783)
+++ mpich2/trunk/README.vin 2012-12-20 04:42:41 UTC (rev 10784)
@@ -1,8 +1,8 @@
MPICH Release %VERSION%
MPICH is a high-performance and widely portable implementation of the
-MPI-2.2 standard from the Argonne National Laboratory. This release
-has all MPI 2.2 functions and features required by the standard with
+MPI-3.0 standard from the Argonne National Laboratory. This release
+has all MPI 3.0 functions and features required by the standard with
the exception of support for the "external32" portable I/O format and
user-defined data representations for I/O.
1
0
Author: goodell
Date: 2012-12-19 21:48:52 -0600 (Wed, 19 Dec 2012)
New Revision: 10781
Added:
mpich2/tags/release/mpich-3.0/
Log:
retag the mpich-3.0 release from branches/release/mpich-3.0@10780
Property changes on: mpich2/tags/release/mpich-3.0
___________________________________________________________________
Added: svn:ignore
+ subsys_include.m4
configure
configure.lineno
config.log
config.status
config.cache
cache.base
*conf.cache
config.system
config.h.in
.mpich2
autom4te.cache
libtool
Makefile.in
Makefile
mpich2-doxygen
lib
*ebug*
*elease*
*.log
mpich2.ncb
mpich2.opt
mpich2.plg
mpich2.suo
coverage*
mpich*pgrs.html
bin
.err
.deps
unusederr.txt
www
cscope.out
cscope.files
*.user
winbuild
man
TAGS
TAGS.bak
README
README.envvar
include
share
aclocal.m4
config.lt
conf.mod
install
Added: svn:mergeinfo
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/groupfailed:9231
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/nem-squash:9995-9998
/mpich2/branches/dev/reenableas:9355
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
1
0
Author: goodell
Date: 2012-12-19 21:48:12 -0600 (Wed, 19 Dec 2012)
New Revision: 10780
Removed:
mpich2/tags/release/mpich-3.0/
Log:
delete the mpich-3.0 tag for retagging
1
0
Author: goodell
Date: 2012-12-19 21:46:55 -0600 (Wed, 19 Dec 2012)
New Revision: 10779
Modified:
mpich2/branches/release/mpich-3.0/CHANGES
Log:
updating CHANGES for 3.0, which is what I always forget to do...
Modified: mpich2/branches/release/mpich-3.0/CHANGES
===================================================================
--- mpich2/branches/release/mpich-3.0/CHANGES 2012-12-20 03:05:06 UTC (rev 10778)
+++ mpich2/branches/release/mpich-3.0/CHANGES 2012-12-20 03:46:55 UTC (rev 10779)
@@ -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.0r…
+ https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich-3.0?…
===============================================================================
1
0
Author: goodell
Date: 2012-12-19 21:05:06 -0600 (Wed, 19 Dec 2012)
New Revision: 10778
Added:
mpich2/tags/release/mpich-3.0/
Log:
create tags/release/mpich-3.0 from branches/release/mpich-3.0@10777
Property changes on: mpich2/tags/release/mpich-3.0
___________________________________________________________________
Added: svn:ignore
+ subsys_include.m4
configure
configure.lineno
config.log
config.status
config.cache
cache.base
*conf.cache
config.system
config.h.in
.mpich2
autom4te.cache
libtool
Makefile.in
Makefile
mpich2-doxygen
lib
*ebug*
*elease*
*.log
mpich2.ncb
mpich2.opt
mpich2.plg
mpich2.suo
coverage*
mpich*pgrs.html
bin
.err
.deps
unusederr.txt
www
cscope.out
cscope.files
*.user
winbuild
man
TAGS
TAGS.bak
README
README.envvar
include
share
aclocal.m4
config.lt
conf.mod
install
Added: svn:mergeinfo
+ /mpich2/branches/dev/ckpt:5050
/mpich2/branches/dev/ckpt2:5057-6537
/mpich2/branches/dev/coll-err-ret:7771-7802
/mpich2/branches/dev/error-return:7662-7670
/mpich2/branches/dev/ftb:5661-5730
/mpich2/branches/dev/groupfailed:9231
/mpich2/branches/dev/lapi:5817
/mpich2/branches/dev/nem-squash:9995-9998
/mpich2/branches/dev/reenableas:9355
/mpich2/branches/dev/wintcp_async_progress:5008-5009,5123,5555-5559,5561-5564,5566-5567,5570,5577-5581,5613-5616,5619
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/branches/release/mpich2-1.2:5406
1
0
Author: goodell
Date: 2012-12-19 21:02:38 -0600 (Wed, 19 Dec 2012)
New Revision: 10777
Modified:
mpich2/branches/release/mpich-3.0/maint/version.m4
Log:
update version.m4 for the 3.0 release
Also update the ABI version string. I bumped it from 9:0:0 to 10:0:0
because of the MPI_INFO_ENV changes.
No reviewer.
Modified: mpich2/branches/release/mpich-3.0/maint/version.m4
===================================================================
--- mpich2/branches/release/mpich-3.0/maint/version.m4 2012-12-19 23:31:43 UTC (rev 10776)
+++ mpich2/branches/release/mpich-3.0/maint/version.m4 2012-12-20 03:02:38 UTC (rev 10777)
@@ -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 @@
#
# 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__
1
0
Author: dinan
Date: 2012-12-19 17:31:43 -0600 (Wed, 19 Dec 2012)
New Revision: 10776
Modified:
mpich2/trunk/src/pm/hydra/ui/mpich/utils.c
Log:
Added -h argument to mpiexec
Added -h as another argument to access hydra's help message.
Reviewer: balaji
Modified: mpich2/trunk/src/pm/hydra/ui/mpich/utils.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2012-12-19 22:24:42 UTC (rev 10775)
+++ mpich2/trunk/src/pm/hydra/ui/mpich/utils.c 2012-12-19 23:31:43 UTC (rev 10776)
@@ -1772,6 +1772,7 @@
static struct HYD_arg_match_table match_table[] = {
/* help options */
{"help", help_fn, help_help_fn},
+ {"h", help_fn, help_help_fn},
/* Global environment options */
{"genv", genv_fn, genv_help_fn},
1
0