summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-01-06 15:23:30 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-01-06 15:23:30 -0400
commit902d4577c73313702dcb0236ce6ea50feefbac09 (patch)
treeb6de494a503a1ecca5afec49885a1fbf94d0f4ee
parent1d24a4b079fd73f9a2ea67a84d47ed701029e6fb (diff)
Increase default cost for p2p remotes from 200 to 1000. This makes git-annex prefer transferring data from special remotes when possible.
-rw-r--r--CHANGELOG8
-rw-r--r--Remote/P2P.hs2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 07dd3d84e..a7a1d8ee8 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 <id@joeyh.name> 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 f0848f831..ca555c30d 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