Merge "Merge branch 'mad-hatter'"

Gerrit Code Review · Gerrit Code Review · commit e041c58212f8 · 2021-01-19T14:41:37.000Z
diff --git a/engines/ep/src/dcp/passive_stream.cc b/engines/ep/src/dcp/passive_stream.cc
@@ -693,6 +693,7 @@ ENGINE_ERROR_CODE PassiveStream::processMessage(
                 std::string("PassiveStream::processMessage: "
                             "Message type not supported"));
     }
+
     if (ret != ENGINE_SUCCESS) {
         // ENOMEM logging is handled by maybeLogMemoryState
         if (ret != ENGINE_ENOMEM) {

Original file line number	Diff line number	Diff line change
`@@ -693,6 +693,7 @@ ENGINE_ERROR_CODE PassiveStream::processMessage(`
`693`	`693`	`std::string("PassiveStream::processMessage: "`
`694`	`694`	`"Message type not supported"));`
`695`	`695`	`}`
	`696`	`+`
`696`	`697`	`if (ret != ENGINE_SUCCESS) {`
`697`	`698`	`// ENOMEM logging is handled by maybeLogMemoryState`
`698`	`699`	`if (ret != ENGINE_ENOMEM) {`