Skip to content

Commit 6769d0d

Browse files
committed
Merge remote-tracking branch 'couchbase/morpheus' into master
* couchbase/morpheus: MB-70409: Remove "always_collect_trace_info" from testapp config Change-Id: I954960c43d913e91b245700163db34fa6565b866
2 parents edb12a5 + 521a310 commit 6769d0d

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

tests/testapp/testapp.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,6 @@ static std::string get_errmaps_dir() {
509509
// If any of these configs are changed, check if it is supported by ns_server
510510
nlohmann::json TestappTest::generate_config() {
511511
nlohmann::json ret = {
512-
{"always_collect_trace_info", true},
513512
{"max_connections", Testapp::MAX_CONNECTIONS},
514513
{"system_connections", Testapp::MAX_CONNECTIONS / 4},
515514
{"stdin_listener", false},

0 commit comments

Comments
 (0)