happinessutil.py: finally rename merge_peers to merge_servers
authorBrian Warner <warner@lothar.com>
Sun, 27 Feb 2011 02:11:24 +0000 (19:11 -0700)
committerBrian Warner <warner@lothar.com>
Sun, 27 Feb 2011 02:11:24 +0000 (19:11 -0700)
commitee14f2ad67f14802195eb046d166caef204035bb
tree52aea9ea2af0e053a356c6ae60a1c046ef46828c
parent13d284b087f6f4e34d11d6625c92d3d38a50e6dc
happinessutil.py: finally rename merge_peers to merge_servers
src/allmydata/immutable/upload.py
src/allmydata/test/test_upload.py
src/allmydata/util/happinessutil.py