Ticket #11888 (verify: fixed)
Handle merge conflicts of two logs
| Reported by: | Anton Piccardo-Selg | Owned by: | Anton Piccardo-Selg | 
|---|---|---|---|
| Priority: | critical | Milestone: | Release 3.5 | 
| Component: | Framework | Keywords: | Adding logs | 
| Cc: | Blocked By: | ||
| Blocking: | Tester: | 
Description
When we add two time series properties we append the values. This means we can end up with two entries which have the same time stamp, e.g. when adding a workspace to itself.
Here we want to detect the collision and introduce a time shift of 1ns to resolve it
Change History
comment:2 Changed 5 years ago by Anton Piccardo-Selg
- Status changed from inprogress to verify
- Resolution set to fixed
This is being verified as pull request #848.
Note: See
        TracTickets for help on using
        tickets.
    

Refs #11888 Provide collision handling for the time series properties
Changeset: 47f9c9a1be305f87958f5966475c91671ea44523