happinessutil.py: finally rename merge_peers to merge_servers

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / util / happinessutil.py

diff --git a/src/allmydata/util/happinessutil.py b/src/allmydata/util/happinessutil.py
index 11d36791cd2cb1108323fb4086466b8dce5f905a..8c7d391c2ce52443bbca06bc736f7ced889dc2b8 100644 (file)
--- a/src/allmydata/util/happinessutil.py
+++ b/src/allmydata/util/happinessutil.py
@@ -54,13 +54,13 @@ def shares_by_server(servermap):
             ret.setdefault(peerid, set()).add(shareid)
     return ret
 
-def merge_peers(servermap, upload_trackers=None):
+def merge_servers(servermap, upload_trackers=None):
     """
-    I accept a dict of shareid -> set(peerid) mappings, and optionally a
-    set of PeerTrackers. If no set of PeerTrackers is provided, I return
+    I accept a dict of shareid -> set(serverid) mappings, and optionally a
+    set of ServerTrackers. If no set of ServerTrackers is provided, I return
     my first argument unmodified. Otherwise, I update a copy of my first
-    argument to include the shareid -> peerid mappings implied in the
-    set of PeerTrackers, returning the resulting dict.
+    argument to include the shareid -> serverid mappings implied in the
+    set of ServerTrackers, returning the resulting dict.
     """
     # Since we mutate servermap, and are called outside of a
     # context where it is okay to do that, make a copy of servermap and