Removed extra lines

telefonicaid · Aug 11, 2023 · f44ccc7 · f44ccc7
1 parent c8b1fa0
commit f44ccc7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -221,7 +221,7 @@ SET (BOOST_MT
 # See http://mongoc.org/libmongoc/current/tutorial.html#cmake
 # This find_package() command provides the mongo::mongoc_static used in
 # SET for common static libs. We use 1.23.1 as reference version.
-find_package (mongoc-1.0 1.23.2 EXACT)
+find_package (mongoc-1.0 1.23.1 EXACT)
 
 # Static libs common to contextBroker and unitTest binaries
 SET (COMMON_STATIC_LIBS

diff --git a/doc/manuals/admin/cli.md b/doc/manuals/admin/cli.md
@@ -185,10 +185,7 @@ The list of available options is the following:
     to the `-k` or `--insecure` parameteres of the curl command.
 -   **-mqttMaxAge**. Max time (in minutes) that an unused MQTT connection is kept. Default: 60
 -   **-logDeprecate**. Log deprecation usages as warnings. More information in [this section of the documentation](../deprecated.md#log-deprecation-warnings). Default is: false. It can be changed after Orion startup with the [log admin REST API](management_api.md#log-configs-and-trace-levels), with the `deprecated` field
-<<<<<<< HEAD
 -   **-notifAlarmThreshold**. Maximum threshold for notification queue alarms, as a percentage of the maximum queue size, default 0 (meaning no queue alarms are used)
-=======
->>>>>>> upstream/master
 
 ## Configuration using environment variables
 
@@ -267,7 +264,4 @@ Two facts have to be taken into account:
 |	ORION_NGSIV1_AUTOCAST	|	ngsiv1Autocast	|
 |       ORION_MQTT_MAX_AGE      |  mqttMaxAge  |
 |       ORION_LOG_DEPRECATE |  logDeprecate |
-<<<<<<< HEAD
 |       ORION_NOTIF_ALARM_THRESHOLD |  notifAlarmThreshold |
-=======
->>>>>>> upstream/master
diff --git a/test/functionalTest/cases/0000_cli/bool_option_with_value.test b/test/functionalTest/cases/0000_cli/bool_option_with_value.test
@@ -103,9 +103,6 @@ Usage: contextBroker  [option '-U' (extended usage)]
                       [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSIv1 update/create attribute operations)]
                       [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is kept, default: 60>]
                       [option '-logDeprecate' (log deprecation usages as warnings)]
-<<<<<<< HEAD
                       [option '-notifAlarmThreshold' <maximum threshold for notification queue alarms, as a percentage of the maximum queue size, default 0 (meaning no queue alarms are used)>]
-=======
->>>>>>> upstream/master
 
 --TEARDOWN--
diff --git a/test/functionalTest/cases/0000_cli/command_line_options.test b/test/functionalTest/cases/0000_cli/command_line_options.test
@@ -92,9 +92,6 @@ Usage: contextBroker  [option '-U' (extended usage)]
                       [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSIv1 update/create attribute operations)]
                       [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is kept, default: 60>]
                       [option '-logDeprecate' (log deprecation usages as warnings)]
-<<<<<<< HEAD
                       [option '-notifAlarmThreshold' <maximum threshold for notification queue alarms, as a percentage of the maximum queue size, default 0 (meaning no queue alarms are used)>]
-=======
->>>>>>> upstream/master
 
 --TEARDOWN--
diff --git a/test/functionalTest/cases/0000_cli/tracelevel_without_logLevel_as_DEBUG.test b/test/functionalTest/cases/0000_cli/tracelevel_without_logLevel_as_DEBUG.test
@@ -93,9 +93,6 @@ Usage: contextBroker  [option '-U' (extended usage)]
                       [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSIv1 update/create attribute operations)]
                       [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is kept, default: 60>]
                       [option '-logDeprecate' (log deprecation usages as warnings)]
-<<<<<<< HEAD
                       [option '-notifAlarmThreshold' <maximum threshold for notification queue alarms, as a percentage of the maximum queue size, default 0 (meaning no queue alarms are used)>]
-=======
->>>>>>> upstream/master
 
 --TEARDOWN--
diff --git a/test/functionalTest/cases/3658_env_vars/env_vars.test b/test/functionalTest/cases/3658_env_vars/env_vars.test
@@ -138,10 +138,7 @@ Extended Usage: contextBroker  [option '-U' (extended usage)]
                                [option '-ngsiv1Autocast' (automatic cast for number, booleans and dates in NGSI]   ORION_NGSIV1_AUTOCAST              FALSE /FALSE/
                                [option '-mqttMaxAge' <max time (in minutes) that an unused MQTT connection is k]   ORION_MQTT_MAX_AGE                 60 /60/
                                [option '-logDeprecate' (log deprecation usages as warnings)]                       ORION_LOG_DEPRECATE                FALSE /FALSE/
-<<<<<<< HEAD
                                [option '-notifAlarmThreshold' <maximum threshold for notification queue alarms,]   ORION_NOTIF_ALARM_THRESHOLD        0 /0/
-=======
->>>>>>> upstream/master