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 2012-07-27 11:57:09 -04:00
commit 4c5002d370
4 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Watch_command_as_of_commit_6cecc26206c4a539999b04664136c6f785211a41_segfaults/comment_5_5e27737a5bb0e9e46c98708700318e67._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 5"
date="2012-07-27T12:20:07Z"
content="""
After some debugging, I looked at the Utility/libkqueue.c and used it as a test, it seems to be hanging/segfaulting around the call to that library. Annoyingly I get segfaults from the library every so often on OSX, it's pretty a random event.
"""]]

9
doc/bugs/yesod-default_is_needed_as_a_dependancy.mdwn Normal file
View file

@ -0,0 +1,9 @@
Seems like there is a needed dependancy, yesod-default is needed on OSX.
<pre>
Utility/Yesod.hs:10:8:
Could not find module `Yesod.Default.Util'
Use -v to see a list of the files searched for.
make: *** [git-annex] Error 1
</pre>

18
doc/design/assistant/blog/day_44__webapp_basics/comment_1_d5fb67f373038e9f583cb2e1992bef67._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="http://jasonwoof.com/"
nickname="JasonWoof"
subject="Your security solution is fine"
date="2012-07-27T06:37:03Z"
content="""
I think making the html file redirect is just fine. desktopcouch does something like this. They talk about it being there to help you find the port number, but it contains the security token too.
They also have some javascript to delay the redirect for a while so you can bookmark the redirect file. You can click to set a cookie to skip the delay in future.
It's been a while since I used desktopcouch, but I found an old redirect file laying around. Here it is:
http://jasonwoof.com/downloads/desktopcouch-redirect.txt
The code is pretty short, you might find something useful there.
- Jason
"""]]

8
doc/forum/Looking_at_the_webapp_on_OSX/comment_5_c735841bc230efc61594ea013fc2902b._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 5"
date="2012-07-27T15:53:50Z"
content="""
I can confirm that the watch command is crashing when i start it up manually.
"""]]