ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-03-10 22:43:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

incorrect merge conflict-resolution

Browse Source
This commit is contained in:
meejah 2020-05-07 20:43:37 -06:00
parent 38069e51fb
commit e6cb700bcc
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/client.py
View File

@ -954,13 +954,6 @@ class _Client(node.Node, pollmixin.PollMixin):
# of the Grid Manager (should that go in the config too,
# then? How to handle multiple grid-managers?)
furl_file = self.config.get_private_path("storage.furl").encode(get_filesystem_encoding())
furl = self.tub.registerReference(ss, furlFile=furl_file)
ann = {
"anonymous-storage-FURL": furl,
"permutation-seed-base32": self._init_permutation_seed(ss),
"grid-manager-certificates": grid_manager_certificates,
}
for ic in self.introducer_clients:
ic.publish("storage", announcement, self._node_private_key)