From f275caf732e2ff66404cfa7d49d15e0925a13838 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 6 Jan 2017 15:23:30 -0400 Subject: [PATCH] Increase default cost for p2p remotes from 200 to 1000. This makes git-annex prefer transferring data from special remotes when possible. --- CHANGELOG | 8 ++++++++ Remote/P2P.hs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 07dd3d84e2..a7a1d8ee83 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +git-annex (6.20170102) UNRELEASED; urgency=medium + + * Increase default cost for p2p remotes from 200 to 1000. + This makes git-annex prefer transferring data from special + remotes when possible. + + -- Joey Hess Fri, 06 Jan 2017 15:22:06 -0400 + git-annex (6.20170101) unstable; urgency=medium * XMPP support has been removed from the assistant in this release. diff --git a/Remote/P2P.hs b/Remote/P2P.hs index f0848f8318..ca555c30d2 100644 --- a/Remote/P2P.hs +++ b/Remote/P2P.hs @@ -45,7 +45,7 @@ remote = RemoteType { chainGen :: P2PAddress -> Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote) chainGen addr r u c gc = do connpool <- mkConnectionPool - cst <- remoteCost gc expensiveRemoteCost + cst <- remoteCost gc veryExpensiveRemoteCost let this = Remote { uuid = u , cost = cst