Remove lines added by pervious merge.

git-svn-id: svn://openib.tc.cornell.edu/gen1@121 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/opensm/user/osmtest/osmt_service.c b/trunk/ulp/opensm/user/osmtest/osmt_service.c
index d82e5fa19dcb34b9d6970eaffa14de9ab3978065..fe4f6015ea7143a3bb3b8c99a26a3121fda8776f 100644 (file)
--- a/trunk/ulp/opensm/user/osmtest/osmt_service.c
+++ b/trunk/ulp/opensm/user/osmtest/osmt_service.c
@@ -1278,11 +1278,7 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
     p_osmt ,
     cl_ntoh64(id[1]),  /*  IN ib_net64_t      service_id, */
     IB_DEFAULT_PKEY,/*  IN ib_net16_t      service_pkey, */
-<<<<<<< .mine
-    cl_hton32(0x00000005), /*  IN ib_net32_t     service_lease, */
-=======
     cl_hton32(0x00000004), /*  IN ib_net32_t     service_lease, */
->>>>>>> .r614
     11,             /*  IN uint8_t         service_key_lsb, */
     (char*)service_name[1]   /*  IN char            *service_name */
     );
@@ -1368,9 +1364,7 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
 
   /* Let OpenSM handle it */
   usleep(100);
-  
-  osm_log( &p_osmt->log, OSM_LOG_ERROR,
-           "osmt_run_service_records_flow: Get 1\n");
+
   status = osmt_get_service_by_name(p_osmt,
                                     (char*)service_name[0],1, &srv_rec);
   if (status != IB_SUCCESS)
@@ -1378,8 +1372,6 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
     goto Exit;
   }
 
-  osm_log( &p_osmt->log, OSM_LOG_ERROR,
-           "osmt_run_service_records_flow: Get 2\n");
   status = osmt_get_service_by_name(p_osmt,
                                     (char*)service_name[1],1, &srv_rec);
   if (status != IB_SUCCESS)
@@ -1387,8 +1379,6 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
     goto Exit;
   }
 
-  osm_log( &p_osmt->log, OSM_LOG_ERROR,
-           "osmt_run_service_records_flow: Get 3\n");
   status = osmt_get_service_by_name(p_osmt,
                                     (char*)service_name[2],1, &srv_rec);
   if (status != IB_SUCCESS)
@@ -1397,8 +1387,6 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
   }
 
   /*  Try to get osmt.srvc.4 b4 (there should be 1 records ) and after 10 sec - It should be deleted */
-  osm_log( &p_osmt->log, OSM_LOG_ERROR,
-           "osmt_run_service_records_flow: Get 4\n");
   status = osmt_get_service_by_name(p_osmt,
                                     (char*)service_name[3],1, &srv_rec);
   if (status != IB_SUCCESS)
@@ -1406,8 +1394,6 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
     goto Exit;
   }
   sleep(10);
-  osm_log( &p_osmt->log, OSM_LOG_ERROR,
-           "osmt_run_service_records_flow: Get 5\n");
   status = osmt_get_service_by_name(p_osmt,
                                     (char*)service_name[3],0, &srv_rec);
   if (status == IB_SUCCESS)
@@ -1415,8 +1401,6 @@ osmt_run_service_records_flow( IN osmtest_t * const p_osmt ) {
     goto Exit;
   }
   /*  Check that for the current Service ID only one record exists */
-  osm_log( &p_osmt->log, OSM_LOG_ERROR,
-           "osmt_run_service_records_flow: Get 6\n");
   status = osmt_get_service_by_id(p_osmt, 1, cl_ntoh64(id[5]),&srv_rec);
   if (status != IB_SUCCESS)
   {