mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-01-01 16:37:16 -04:00
commit ba20e5a7f4
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/bugs/assistant_eats_all_CPU/comment_2_0d577d5ca22df14dadf21d4a1a5f9474._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://id.koumbit.net/anarcat"
ip="2001:1928:1:9::1"
subject="comment 2"
date="2014-01-01T20:29:59Z"
content="""
Humm... it doesn't look like #677096 is fixed in wheezy, are you sure this isn't the problem I am seeing?
I am considering upgrading this machine to jessie soon, would that help diagnosing the problem?
Regarding the other bug, if you are refering to [[webapp takes 100% of the cpu]], i do believe it's a different issue because the CPU usage is lower in the assistant when it's *not* transfering lots of small files.
"""]]

10
doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__/comment_1_8e2a14842b44844f90c80b862a1b3a6d._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 1"
date="2014-01-01T20:31:21Z"
content="""
I think you can fix at least the immediate problem by deleting the .git/MERGE_HEAD file.
"""]]