Merge branch 'ofi2' of https://github.com/anandhis/ompi into ofi2

Conflicts:
	orte/mca/rml/ofi/rml_ofi_component.c

 All conflicts fixed but you are still merging.
   (use "git commit" to conclude merge)

 Changes to be committed:

	modified:   ../orte/mca/rml/ofi/rml_ofi_component.c

Author: anandhis

orte/mca/rml/ofi/rml_ofi_component.c

@@ -218,6 +218,7 @@ rml_ofi_component_close(void)
                                                   (void **) &value, node, &node);
     }
 
+
     /* release all peers from the hash table */
     rc = opal_hash_table_get_first_key_uint64 (&orte_rml_ofi.peers, &key,
                                                (void **) &value, &node);
@@ -228,6 +229,7 @@ rml_ofi_component_close(void)
         rc = opal_hash_table_get_next_key_uint64 (&orte_rml_ofi.peers, &key,
                                                   (void **) &value, node, &node);
     }
+
     OBJ_DESTRUCT(&orte_rml_ofi.peers);
 
     opal_output_verbose(10,orte_rml_base_framework.framework_output,
@@ -342,8 +344,7 @@ static orte_rml_pathway_t* query_transports(void)
     opal_value_t *providers_list, *prev_provider=NULL, *next_provider=NULL;
     struct fi_info *cur_fi = NULL;
     int ret = 0, ofi_prov_num = 0;
-
- opal_output_verbose(10,orte_rml_base_framework.framework_output,
+    opal_output_verbose(10,orte_rml_base_framework.framework_output,
                         "%s:%d OFI Query Interface not implemented",__FILE__,__LINE__);
 
     return ORTE_SUCCESS;
@@ -1105,7 +1106,6 @@ static orte_rml_base_module_t* open_conduit(opal_list_t *attributes)
         /* [TODO] add any additional attributes check here */
 
     }
-
     opal_output_verbose(20,orte_rml_base_framework.framework_output,
                     "%s - ofi is not a candidate as per attributes, returning NULL",
                     ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));