Commit cbd6ab1
committed
Merge remote-tracking branch 'origin/main' into delete-utilities-record
# Conflicts:
# Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/WatchDogsTests/CrashableFunctionStore.cs
# Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/Invoker.cs
# Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/Workflow.cs
# Core/Cleipnir.ResilientFunctions/Storage/IFunctionStore.cs
# Core/Cleipnir.ResilientFunctions/Storage/InMemoryFunctionStore.cs
# Samples/Sample.ConsoleApp/Utils/CrashableFunctionStore.cs
# Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB/MariaDbFunctionStore.cs4 files changed
Lines changed: 5 additions & 5 deletions
File tree
- .github/workflows
- Samples/Sample.ConsoleApp
- Stores
- EnsureDatabaseConnections
- SqlServer/Cleipnir.ResilientFunctions.SqlServer
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | | - | |
| 32 | + | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
0 commit comments