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