Skip to content
Snippets Groups Projects
Commit d415c508 authored by Constantin P.'s avatar Constantin P. 💬
Browse files

Conflict resolved

parents a13f8b5d 2f8009ab
No related branches found
No related tags found
4 merge requests!1779Develop port 02 12,!1743Hotfix update subs,!1729Hotfixes 24 10 asan,!1709feature-13362
Subproject commit 5bc73b620d0b3af2282a37072e577af8ac8288dd
Subproject commit dcc66bb70ea4c141ed2d748b9cf12ee3e3915261
Subproject commit 30ca81aa136d316d59fd89c234e785e123d370dc
Subproject commit 990a8a7a7b3aa24d21e2f05019f3b2fd4467b269
......@@ -20,7 +20,7 @@ node-role=
#permanent_nodes_hosts=[]
# This addresses will have priviledged acceess to some GDB groups
authorized_nodes_addrs=[BCA3::B097::DCDC::CB2B, 038E::0C9B::A3E8::C533, CC88::3F68::5313::1577, 72F9::511B::616A::A46F, A2C2::0CD4::38BA::2E8C, A983::7C3F::7FD4::4950, D1E4::F837::F42C::BFEF, B6E5::1B78::847A::F026]
# This hosts wiil be used as bootstrap balancers for first net access
# This hosts will be used as bootstrap balancers for first net access
seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net:8079, 2.root.raiden.cellframe.net:8079]
#[auth]
......
......@@ -21,7 +21,7 @@ node-role=
# This addresses will have priviledged acceess to some GDB groups
authorized_nodes_addrs=[D420::C2A9::0637::040C,AC33::9A06::AAD8::B288,5DA8::C171::E316::C923,72F9::511B::616A::A46F,A2C2::0CD4::38BA::2E8C,A983::7C3F::7FD4::4950,D1E4::F837::F42C::BFEF]
# This hosts wiil be used as bootstrap balancers for first net access
# This hosts will be used as bootstrap balancers for first net access
seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.net:8079, 2.root.riemann.cellframe.net:8079]
#[auth]
......
......@@ -18,7 +18,7 @@ node-role=
#permanent_nodes_hosts=[]
# This addresses will have priviledged acceess to some GDB groups
authorized_nodes_addrs=[608C::F7B7::D476::2438, 7497::4FB4::CFA1::9823, 5641::292F::13F5::F039]
# This hosts wiil be used as bootstrap balancers for first net access
# This hosts will be used as bootstrap balancers for first net access
seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.net:8190, 2.root.subzero.cellframe.net:8190]
#[auth]
......
VERSION_MAJOR=5
VERSION_MINOR=3
VERSION_PATCH=176
VERSION_PATCH=177
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment