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

5 files changed, 58 insertions, 2 deletions

diff --git a/doc/bugs/Share_with_friends_crash_in_osx/comment_11_1a0e174969e99e7b562854d2c3b3e606._comment b/doc/bugs/Share_with_friends_crash_in_osx/comment_11_1a0e174969e99e7b562854d2c3b3e606._comment
new file mode 100644
index 000000000..5b5b94a40
--- /dev/null
+++ b/doc/bugs/Share_with_friends_crash_in_osx/comment_11_1a0e174969e99e7b562854d2c3b3e606._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkLdR1fuu5aEz3s9VKTBKVMize_SmeNRJM"
+ nickname="David"
+ subject="Past the SHA issues"
+ date="2014-01-20T23:14:53Z"
+ content="""
+Now we still have an issue with nettle, but now it's part of urandom.  I'm not sure what to suggest...
+
+[[!format sh \"\"\"
+Thread 1 Crashed:
+0   H                             	0x00000001075d9756 do_device_source_urandom + 108
+1   H                             	0x00000001075d9686 do_device_source + 46
+2   H                             	0x00000001075d92b9 wrap_nettle_rnd_init + 74
+3   H                             	0x000000010755d585 _gnutls_rnd_init + 32
+4   H                             	0x0000000107551dae gnutls_global_init + 262
+5   git-annex                     	0x00000001054a28c3 0x103c83000 + 25295043
+6   git-annex                     	0x000000010692ab28 0x103c83000 + 46824232
+\"\"\"]]
+"""]]
diff --git a/doc/devblog/day_101__old_mistakes/comment_1_2c6e991efde3296450189b2821f2ccc3._comment b/doc/devblog/day_101__old_mistakes/comment_1_2c6e991efde3296450189b2821f2ccc3._comment
new file mode 100644
index 000000000..93fb84aa3
--- /dev/null
+++ b/doc/devblog/day_101__old_mistakes/comment_1_2c6e991efde3296450189b2821f2ccc3._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 1"
+ date="2014-01-21T00:20:34Z"
+ content="""
+Some more details on
+
+* when the old mechanism will stop working
+* how you will ensure interoperability in repo sets which have different versions installed in different places
+* which option weighs more heavily
+
+would be appreciated.
+
+
+Richard
+"""]]
diff --git a/doc/devblog/day_101__old_mistakes/comment_2_524690d69056737dd296e4f7626737d2._comment b/doc/devblog/day_101__old_mistakes/comment_2_524690d69056737dd296e4f7626737d2._comment
new file mode 100644
index 000000000..9f7ebecf1
--- /dev/null
+++ b/doc/devblog/day_101__old_mistakes/comment_2_524690d69056737dd296e4f7626737d2._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.249"
+ subject="comment 2"
+ date="2014-01-21T02:23:00Z"
+ content="""
+I don't plan to remove .git/config annex.numcopies support. It is 5 lines of code. 
+
+A fundamental problem with the .git/config annex.numcopies setting is that it can be inconsistently set between repositories. Therefore, there is no worse potential with interoperability if you use differing versions of git-annex that support and do not support the new global numcopies setting. If this was a concern though, you can use .gitattributes to set annex.numcopies for *, which all recent versions of git-annex support.
+
+The old git/config annex.numcopies setting is overridden as soon as you use `git annex numcopies`. In turn `git annex numcopies` is overridden by any relevant .gitattributes annex.numcopies setting. This is documented on the man page.
+"""]]
diff --git a/doc/devblog/day_94__leaks.mdwn b/doc/devblog/day_94__leaks.mdwn
index bd3b9f9d4..3aa4e1552 100644
--- a/doc/devblog/day_94__leaks.mdwn
+++ b/doc/devblog/day_94__leaks.mdwn
@@ -7,6 +7,6 @@ have gotten them all fixed:
 Before: [[bugs/import_memleak_from_the_assistant/leakbefore.png]]
 After: [[bugs/import_memleak_from_the_assistant/leakafter.png]]
 
-Also fixed a bug in `git annex add` when the disk was completely full. It
-could sometimes in that situation move the file from the work tree to
+Also fixed a bug in `git annex add` when the disk was completely full.
+In that situation, it could sometimes move the file from the work tree to
 .git/annex/objects and fail to put the symlink in place.
diff --git a/doc/devblog/day_99__catching_up_again/comment_2_c8363d47223e7bb899420e800bde3e27._comment b/doc/devblog/day_99__catching_up_again/comment_2_c8363d47223e7bb899420e800bde3e27._comment
new file mode 100644
index 000000000..fb2377845
--- /dev/null
+++ b/doc/devblog/day_99__catching_up_again/comment_2_c8363d47223e7bb899420e800bde3e27._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnE6kFAbud1LWrQuyX76yMYnUjHt9tR-A8"
+ nickname="Leonardo"
+ subject="Chroots"
+ date="2014-01-21T13:52:29Z"
+ content="""
+How about simply having sshd inside the chroot?
+"""]]