svn merge -r5440:5448 https://svn.open-mpi.org/svn/ompi/tmp/hetero . --> to get to a state where src/dps and test/dps no longer exist A test/mca/dps A test/mca/dps/dps_test.c A test/mca/dps/Makefile.am U test/mca/gpr/gpr_triggers.c U test/mca/gpr/gpr_internal_fns.c D test/dps/dps_test.c D test/dps/Makefile.am D test/dps U include/orte_config.h A src/dynamic-mca/dps A src/dynamic-mca/dps/Makefile.am A src/dynamic-mca/schema A src/dynamic-mca/schema/Makefile.am U src/dynamic-mca/Makefile.am U src/include/orte_schema.h U src/include/constants.h U src/include/orte_types.h U src/include/orte_constants.h C src/runtime/ompi_progress.c U src/runtime/orte_schema.c U src/runtime/orte_init.c U src/mpi/runtime/ompi_mpi_init.c C src/tools/orterun/orterun.c U src/mca/oob/tcp/oob_tcp.c U src/mca/ns/ns_types.h U src/mca/rmaps/base/rmaps_base_map.h U src/mca/rmaps/base/rmaps_base_map.c U src/mca/ras/base/ras_base_node.c A src/mca/dps A src/mca/dps/dps_types.h A src/mca/dps/default A src/mca/dps/Makefile.am A src/mca/dps/base A src/mca/dps/base/dps_pack_native_types.c A src/mca/dps/base/base.h A src/mca/dps/base/dps_pack_orte_types.c A src/mca/dps/base/dps_utilities.c A src/mca/dps/base/dps_unpack.c A src/mca/dps/base/dps_load_unload.c A src/mca/dps/base/dps_peek.c A src/mca/dps/base/dps_open_close.c A src/mca/dps/dps.h U src/mca/soh/soh_types.h U src/mca/soh/base/soh_base_get_proc_soh.c U src/mca/soh/base/soh_base_set_proc_soh.c U src/mca/pls/fork/pls_fork_module.c U src/mca/pls/base/pls_base_state.c U src/mca/pls/rsh/pls_rsh_module.c A src/mca/schema A src/mca/schema/default A src/mca/schema/default/schema_default.c A src/mca/schema/default/schema_default_component.c A src/mca/schema/default/Makefile.am A src/mca/schema/default/schema_default.h A src/mca/schema/schema.h A src/mca/schema/Makefile.am A src/mca/schema/schema_types.h A src/mca/schema/base A src/mca/schema/base/base.h A src/mca/schema/base/schema_base_close.c A src/mca/schema/base/Makefile.am A src/mca/schema/base/schema_base_select.c A src/mca/schema/base/schema_base_open.c U src/mca/rmgr/proxy/rmgr_proxy.c U src/mca/rmgr/urm/rmgr_urm.c U src/mca/rmgr/base/rmgr_base_open.c U src/mca/rmgr/base/rmgr_base_stage_gate.c U src/mca/rmgr/base/rmgr_base_context.c U src/mca/Makefile.am U src/mca/base/mca_base_module_exchange.c U src/communicator/comm_publish.c U src/attribute/attribute_predefined.c U src/class/orte_pointer_array.c U src/class/orte_pointer_array.h U src/Makefile.am U src/util/argv.c U src/util/argv.h D src/dps/dps_types.h D src/dps/dps_pack.c D src/dps/orte_dps_open_close.c D src/dps/dps_load_unload.c D src/dps/dps_internal.h D src/dps/dps_unpack.c D src/dps/Makefile.am D src/dps/dps_internal_functions.c D src/dps/dps_peek.c D src/dps/dps.h D src/dps U configure.ac U config/ompi_mca.m4 svn merge -r5448:5496 https://svn.open-mpi.org/svn/ompi/tmp/hetero . --> to get to a state where src/include/orte_types.h no longer exists A test/mca/schema A test/mca/schema/test_schema.c A test/mca/schema/Makefile.am U test/mca/Makefile.am D test/mca/dps/dps_test.c D test/mca/dps/Makefile.am D test/mca/dps A test/dps A test/dps/dps_test.c A test/dps/Makefile.am U include/orte_config.h U src/dynamic-mca/schema U src/dynamic-mca/Makefile.am D src/dynamic-mca/dps/Makefile.am D src/dynamic-mca/dps U src/include/Makefile.am D src/include/orte_schema.h D src/include/orte_types.h U src/runtime/orte_init_stage1.c U src/runtime/Makefile.am U src/runtime/ompi_progress.c U src/runtime/orte_finalize.c D src/runtime/orte_schema.c U src/mpi/runtime/ompi_mpi_finalize.c A src/dps A src/dps/dps_types.h A src/dps/dps_pack.c A src/dps/orte_dps_open_close.c A src/dps/dps_internal.h A src/dps/dps_unpack.c A src/dps/dps_load_unload.c A src/dps/Makefile.am A src/dps/dps_register.c A src/dps/dps_peek.c A src/dps/dps_internal_functions.c A src/dps/dps.h U src/tools/console/orteconsole.c U src/tools/orted/orted.c U src/tools/orterun/orterun.c U src/mca/oob/tcp/oob_tcp_addr.h U src/mca/oob/base/oob_base_send_nb.c U src/mca/oob/base/oob_base_send.c U src/mca/oob/base/oob_base_recv_nb.c U src/mca/oob/base/oob_base_recv.c U src/mca/ns/replica/src/ns_replica.h U src/mca/ns/proxy/src/ns_proxy.c U src/mca/ns/ns_types.h U src/mca/rmaps/base/rmaps_base_map.c U src/mca/gpr/replica/api_layer/gpr_replica_subscribe_api.c U src/mca/gpr/replica/api_layer/gpr_replica_segment_ops_api.c U src/mca/gpr/replica/api_layer/gpr_replica_dump_api.c U src/mca/gpr/replica/api_layer/gpr_replica_api.h U src/mca/gpr/replica/api_layer/gpr_replica_compound_cmd_api.c U src/mca/gpr/replica/api_layer/gpr_replica_put_get_api.c U src/mca/gpr/replica/api_layer/Makefile.am U src/mca/gpr/replica/api_layer/gpr_replica_del_index_api.c D src/mca/gpr/replica/api_layer/gpr_replica_messaging_api.c U src/mca/gpr/replica/transition_layer/gpr_replica_segment_tl.c U src/mca/gpr/replica/transition_layer/gpr_replica_dict_tl.c U src/mca/gpr/replica/transition_layer/gpr_replica_tl.h U src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c U src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c U src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c U src/mca/gpr/replica/communications/gpr_replica_remote_msg.c U src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c U src/mca/gpr/replica/communications/gpr_replica_dump_cm.c U src/mca/gpr/replica/communications/gpr_replica_compound_cmd_cm.c U src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c U src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c U src/mca/gpr/replica/gpr_replica_component.c U src/mca/gpr/replica/gpr_replica.h U src/mca/gpr/replica/functional_layer/gpr_replica_dump_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_fn.h U src/mca/gpr/replica/functional_layer/gpr_replica_trig_ops_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_put_get_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_cleanup_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_arithmetic_ops_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_del_index_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_messaging_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_subscribe_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_segment_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_dict_fn.c U src/mca/gpr/proxy/gpr_proxy.h U src/mca/gpr/proxy/gpr_proxy_dump.c U src/mca/gpr/proxy/gpr_proxy_cleanup.c U src/mca/gpr/proxy/gpr_proxy_put_get.c U src/mca/gpr/proxy/gpr_proxy_compound_cmd.c U src/mca/gpr/proxy/gpr_proxy_arithmetic_ops.c U src/mca/gpr/proxy/gpr_proxy_del_index.c U src/mca/gpr/proxy/gpr_proxy_messaging.c U src/mca/gpr/proxy/gpr_proxy_internals.c U src/mca/gpr/proxy/gpr_proxy_general_operations.c U src/mca/gpr/proxy/gpr_proxy_subscribe.c U src/mca/gpr/proxy/gpr_proxy_component.c U src/mca/gpr/gpr_types.h U src/mca/gpr/base/base.h U src/mca/gpr/base/gpr_base_open.c A src/mca/gpr/base/data_type_support A src/mca/gpr/base/data_type_support/gpr_type_notify_action.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_del_index.c U src/mca/gpr/base/unpack_api_response/gpr_base_dump_notify.c U src/mca/gpr/base/unpack_api_response/gpr_base_print_dump.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_subscribe.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_cleanup.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c U src/mca/gpr/base/unpack_api_response/gpr_base_decode_startup_msg.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_subscribe.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_dump.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_cleanup.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_arithmetic_ops.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c U src/mca/gpr/gpr.h U src/mca/soh/soh_types.h U src/mca/soh/base/soh_base_get_proc_soh.c U src/mca/soh/base/soh_base_set_proc_soh.c U src/mca/rml/rml.h U src/mca/errmgr/errmgr.h U src/mca/errmgr/base/errmgr_base_fns.c U src/mca/schema/schema.h U src/mca/schema/schema_types.h U src/mca/schema/base/schema_base_close.c U src/mca/schema/base/base.h U src/mca/schema/base/Makefile.am U src/mca/schema/base/schema_base_select.c U src/mca/schema/base/schema_base_open.c U src/mca/schema/base D src/mca/schema/default/schema_default.c D src/mca/schema/default/schema_default_component.c D src/mca/schema/default/Makefile.am D src/mca/schema/default/schema_default.h D src/mca/schema/default U src/mca/schema U src/mca/rmgr/rmgr_types.h U src/mca/rmgr/urm/rmgr_urm_component.c U src/mca/rmgr/base/rmgr_base_pack.c U src/mca/rmgr/base/base.h U src/mca/rmgr/base/rmgr_base_unpack.c U src/mca/rmgr/base/rmgr_base_stage_gate.c U src/mca/rmgr/rmgr.h U src/mca/Makefile.am U src/mca/base/mca_base_module_exchange.c D src/mca/dps/dps_types.h D src/mca/dps/default D src/mca/dps/Makefile.am D src/mca/dps/base/dps_pack_native_types.c D src/mca/dps/base/base.h D src/mca/dps/base/dps_pack_orte_types.c D src/mca/dps/base/dps_utilities.c D src/mca/dps/base/dps_unpack.c D src/mca/dps/base/dps_load_unload.c D src/mca/dps/base/dps_peek.c D src/mca/dps/base/dps_open_close.c D src/mca/dps/base D src/mca/dps/dps.h D src/mca/dps U src/Makefile.am U configure.ac U config/ompi_mca.m4 svn merge -r5496:5506 https://svn.open-mpi.org/svn/ompi/tmp/hetero . --> to get to a state where dps_register.c A src/include/orte_types.h U src/runtime/orte_init_stage1.c U src/runtime/orte_finalize.c U src/dps/dps_types.h U src/dps/dps_pack.c U src/dps/orte_dps_open_close.c U src/dps/dps_unpack.c U src/dps/dps_internal.h U src/dps/Makefile.am U src/dps/dps_internal_functions.c U src/dps/dps.h D src/dps/dps_register.c U src/mca/oob/tcp/oob_tcp_addr.h U src/mca/oob/base/oob_base_send_nb.c U src/mca/oob/base/oob_base_send.c U src/mca/oob/base/oob_base_recv_nb.c U src/mca/oob/base/oob_base_recv.c U src/mca/ns/replica/src/ns_replica.c U src/mca/ns/replica/src/ns_replica_component.c U src/mca/ns/replica/src/ns_replica.h U src/mca/ns/proxy/src/ns_proxy.c U src/mca/ns/proxy/src/ns_proxy_component.c U src/mca/ns/proxy/src/ns_proxy.h U src/mca/ns/ns.h U src/mca/ns/ns_types.h U src/mca/ns/base/base.h U src/mca/ns/base/ns_base_local_fns.c U src/mca/ns/base/ns_base_open.c U src/mca/gpr/replica/api_layer/gpr_replica_subscribe_api.c U src/mca/gpr/replica/api_layer/gpr_replica_dump_api.c U src/mca/gpr/replica/api_layer/gpr_replica_compound_cmd_api.c U src/mca/gpr/replica/communications/gpr_replica_arithmetic_ops_cm.c U src/mca/gpr/replica/communications/gpr_replica_del_index_cm.c U src/mca/gpr/replica/communications/gpr_replica_subscribe_cm.c U src/mca/gpr/replica/communications/gpr_replica_remote_msg.c U src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c U src/mca/gpr/replica/communications/gpr_replica_dump_cm.c U src/mca/gpr/replica/communications/gpr_replica_put_get_cm.c U src/mca/gpr/replica/communications/gpr_replica_cleanup_cm.c U src/mca/gpr/replica/communications/gpr_replica_compound_cmd_cm.c U src/mca/gpr/replica/functional_layer/gpr_replica_dump_fn.c U src/mca/gpr/proxy/gpr_proxy.h U src/mca/gpr/proxy/gpr_proxy_dump.c U src/mca/gpr/proxy/gpr_proxy_cleanup.c U src/mca/gpr/proxy/gpr_proxy_put_get.c U src/mca/gpr/proxy/gpr_proxy_compound_cmd.c U src/mca/gpr/proxy/gpr_proxy_arithmetic_ops.c U src/mca/gpr/proxy/gpr_proxy_del_index.c U src/mca/gpr/proxy/Makefile.am U src/mca/gpr/proxy/gpr_proxy_general_operations.c U src/mca/gpr/proxy/gpr_proxy_subscribe.c U src/mca/gpr/proxy/gpr_proxy_component.c D src/mca/gpr/proxy/gpr_proxy_messaging.c U src/mca/gpr/gpr_types.h U src/mca/gpr/base/base.h U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_del_index.c U src/mca/gpr/base/unpack_api_response/gpr_base_dump_notify.c U src/mca/gpr/base/unpack_api_response/gpr_base_print_dump.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_subscribe.c U src/mca/gpr/base/unpack_api_response/Makefile.am U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_put_get.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_cleanup.c U src/mca/gpr/base/unpack_api_response/gpr_base_unpack_arithmetic_ops.c D src/mca/gpr/base/unpack_api_response/gpr_base_decode_startup_msg.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_subscribe.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_dump.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_put_get.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_cleanup.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_arithmetic_ops.c U src/mca/gpr/base/pack_api_cmd/gpr_base_pack_del_index.c U src/mca/soh/soh_types.h A src/mca/schema/base/schema_base_fns.c U src/mca/rmgr/rmgr_types.h U src/mca/rmgr/urm/rmgr_urm_component.c U src/mca/rmgr/base/rmgr_base_pack.c U src/mca/rmgr/base/base.h U src/mca/rmgr/base/rmgr_base_unpack.c U src/mca/rmgr/base/rmgr_base_stage_gate.c U src/mca/base/mca_base_module_exchange.c U src/Makefile.am svn merge -r5506:5551 https://svn.open-mpi.org/svn/ompi/tmp/hetero . --> to get the rest U test/mca/schema U test/mca/ns/ns_replica.c U test/mca/gpr/gpr_triggers.c U test/mca/gpr/gpr_overwrite.c U test/mca/gpr/gpr_put_get.c U test/mca/gpr/gpr_threads.c U test/mca/gpr/gpr_mem_leaks.c U test/mca/gpr/gpr_internal_fns.c U test/dps/dps_test.c U test/dps U src/dynamic-mca/schema U src/runtime/orte_init_stage1.c U src/runtime/orte_init.c A src/dps/dps_lookup.c U src/dps/dps_pack.c U src/dps/orte_dps_open_close.c U src/dps/dps_internal.h U src/dps/dps_unpack.c U src/dps/Makefile.am U src/dps/dps_peek.c U src/dps/dps_internal_functions.c A src/dps/dps_register.c U src/dps/dps.h U src/dps U src/tools/console/orteconsole.c U src/tools/orted/orted.c U src/mca/ns/replica/src/ns_replica.c U src/mca/ns/replica/src/ns_replica_component.c U src/mca/ns/replica/src/ns_replica.h U src/mca/ns/proxy/src/ns_proxy.c U src/mca/ns/proxy/src/ns_proxy_component.c U src/mca/ns/proxy/src/ns_proxy.h U src/mca/ns/ns.h U src/mca/ns/base/base.h A src/mca/ns/base/data_type_support A src/mca/ns/base/data_type_support/ns_data_type_unpacking_fns.c A src/mca/ns/base/data_type_support/Makefile.am A src/mca/ns/base/data_type_support/ns_data_type_packing_fns.c U src/mca/ns/base/data_type_support U src/mca/ns/base/Makefile.am U src/mca/ns/base/ns_base_local_fns.c U src/mca/ns/base/ns_base_open.c U src/mca/gpr/replica/communications/gpr_replica_cmd_processor.c U src/mca/gpr/replica/functional_layer/gpr_replica_put_get_fn.c U src/mca/gpr/replica/functional_layer/gpr_replica_messaging_fn.c U src/mca/gpr/gpr_types.h U src/mca/gpr/base/base.h U src/mca/gpr/base/gpr_base_open.c A src/mca/gpr/base/data_type_support/gpr_data_type_packing_fns.c A src/mca/gpr/base/data_type_support/gpr_data_type_unpacking_fns.c A src/mca/gpr/base/data_type_support/Makefile.am D src/mca/gpr/base/data_type_support/gpr_type_notify_action.c U src/mca/gpr/base/data_type_support U src/mca/gpr/base/Makefile.am U src/mca/soh/base/base.h U src/mca/soh/base/soh_base_open.c A src/mca/soh/base/data_type_support A src/mca/soh/base/data_type_support/soh_data_type_packing_fns.c A src/mca/soh/base/data_type_support/Makefile.am A src/mca/soh/base/data_type_support/soh_data_type_unpacking_fns.c U src/mca/soh/base/data_type_support U src/mca/soh/base/Makefile.am U src/mca/schema/schema_types.h U src/mca/schema/base/schema_base_fns.c U src/mca/schema/base U src/mca/schema U src/mca/rmgr/base/base.h U src/mca/rmgr/base/rmgr_base_open.c A src/mca/rmgr/base/data_type_support A src/mca/rmgr/base/data_type_support/rmgr_data_type_packing_fns.c A src/mca/rmgr/base/data_type_support/rmgr_data_type_unpacking_fns.c A src/mca/rmgr/base/data_type_support/Makefile.am U src/mca/rmgr/base/data_type_support U src/mca/rmgr/base/Makefile.am U src/class/orte_value_array.c U src/class/orte_pointer_array.h U src/Makefile.am U configure.ac U config/ompi_mca.m4