Skip to content
Snippets Groups Projects
Commit a2593839 authored by Josh Brooks's avatar Josh Brooks
Browse files

Merge branch 'release' of git.xx.network:elixxir/integration into...

Merge branch 'release' of git.xx.network:elixxir/integration into feature/XX-3578/SendWithVerification
parents ce7a91a8 d74d9ae2
Branches
Tags
3 merge requests!68Master merge,!12Feature/xx 3578/send with verification,!11Release
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"MinimumDelay": 3000, "MinimumDelay": 3000,
"RealtimeDelay": 5000, "RealtimeDelay": 5000,
"SemiOptimalOrdering": true, "SemiOptimalOrdering": true,
"Threshold": 3, "Threshold": 0.3,
"NodeCleanUpInterval": 3, "NodeCleanUpInterval": 3,
"ResourceQueueTimeout": 300000 "ResourceQueueTimeout": 300000
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"MinimumDelay": 60, "MinimumDelay": 60,
"RealtimeDelay": 120, "RealtimeDelay": 120,
"SemiOptimalOrdering": true, "SemiOptimalOrdering": true,
"Threshold": 3, "Threshold": 0.3,
"NodeCleanUpInterval": 3, "NodeCleanUpInterval": 3,
"ResourceQueueTimeout": 300000 "ResourceQueueTimeout": 300000
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment