Commit 39d5106
committed
Merge branch 'alexeyk/test-base-arm64-fixes' into alexeyk/test-base-windows
# Conflicts:
# communication/src/test/java/datadog/communication/serialization/msgpack/MsgPackWriterTest.java
# components/json/src/test/java/datadog/json/JsonReaderTest.java
# dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid/BuildIdExtractorIntegrationTest.java3 files changed
Lines changed: 5 additions & 5 deletions
File tree
- communication/src/test/java/datadog/communication/serialization/msgpack
- components/json/src/test/java/datadog/json
- dd-java-agent/agent-crashtracking/src/test/java/datadog/crashtracking/buildid
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
666 | 666 | | |
667 | 667 | | |
668 | 668 | | |
669 | | - | |
| 669 | + | |
670 | 670 | | |
671 | 671 | | |
672 | 672 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
| 218 | + | |
218 | 219 | | |
219 | 220 | | |
220 | 221 | | |
| |||
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
140 | | - | |
141 | | - | |
142 | | - | |
| 140 | + | |
| 141 | + | |
143 | 142 | | |
144 | 143 | | |
145 | 144 | | |
| |||
0 commit comments