Skip to content
Snippets Groups Projects
Commit 7942c3b5 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Merge branch dcraik_mergeAndReset_checkAndTest into sponce_SinkAndMerge 

* commit '4f9b230e':
  fix formatting
  Add type check to Entity::mergeAndReset
  Test for Monitoring::Hub::Entity::mergeAndReset
parents daf3de22 4f9b230e
No related branches found
No related tags found
1 merge request!1278Better (and working) implementation of non mergeable objects in Sinks
Pipeline #3331134 passed
Stage: pre-build-checks
    Stage: build
      Stage: test
        Hide whitespace changes
        Inline Side-by-side
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment