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

8 files changed, 64 insertions, 0 deletions

diff --git a/doc/bugs/git_annex_import_fails_on_filenames_with_newlines_in_them/comment_4_3f5e17f5d73892784640e468578819c4._comment b/doc/bugs/git_annex_import_fails_on_filenames_with_newlines_in_them/comment_4_3f5e17f5d73892784640e468578819c4._comment
new file mode 100644
index 000000000..af72fcb88
--- /dev/null
+++ b/doc/bugs/git_annex_import_fails_on_filenames_with_newlines_in_them/comment_4_3f5e17f5d73892784640e468578819c4._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="graboluk@f6de53961ab0f884e203f602f65eb5cdc0fb7513"
+ nickname="graboluk"
+ subject="very annoying for new users"
+ date="2015-09-25T17:06:45Z"
+ content="""
+Hi, I'd just spent better part of a day trying to figure out why git-annex keeps crashing. I've set up everything as in the instructional video for git-annex assistant, and proceeded to add my document directory with 3000 files (latex projects, etc). git-latex started to complain about unrecognized response from git. I tried many times again, to make long story short, turns out one of my files had newline in its name (I don't even know how it happened)  
+
+This was extremely annoying because the message which the assistant was giving me was always about some other file, the name of the offending file did not appear. So I've spent a day trying to figure out a minimal offending example (there were more obvious potential culprits - like the fact that I have many read-only dirs and so on...)
+
+Also, it's not a great first impression considering I'm trying to migrate from dropbox, which hasn't had any problems.
+
+Anyway, it's a great project. Is there a way to donate? (if it replaces dropbox for me for a month of my usual workflow I'd be very happy to donate!)
+
+"""]]
diff --git a/doc/forum/Correct_way_to_use_somewhat_unreliable_private_server_and_box.com.mdwn b/doc/forum/Correct_way_to_use_somewhat_unreliable_private_server_and_box.com.mdwn
new file mode 100644
index 000000000..0aa122203
--- /dev/null
+++ b/doc/forum/Correct_way_to_use_somewhat_unreliable_private_server_and_box.com.mdwn
@@ -0,0 +1,3 @@
+I have a private server (a computer at work) which I use as the "central repository" with git-annex. Unfortunately it sometimes goes down and occasionally I can't easilly put it on again (think holidays). So I'd like to use box.com as a backup.
+
+What's the most efficient way to do it? Simply add both my private serer and box.com as "transfer: distributes files to clients" repositiories? I'm afraid that if I do that then box.com will slow things down for me (I haven't tried it yet because I'm literally starting with git-annex today). Ideally I'd like all transfers to/from box.com to be somehow in the background so that they don't interfere with the transfers to/from my private server.
diff --git a/doc/forum/Correct_way_to_use_somewhat_unreliable_private_server_and_box.com/comment_1_9c357a4a99930936124a58ffe105f87f._comment b/doc/forum/Correct_way_to_use_somewhat_unreliable_private_server_and_box.com/comment_1_9c357a4a99930936124a58ffe105f87f._comment
new file mode 100644
index 000000000..e159e2e97
--- /dev/null
+++ b/doc/forum/Correct_way_to_use_somewhat_unreliable_private_server_and_box.com/comment_1_9c357a4a99930936124a58ffe105f87f._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw"
+ nickname="Carl"
+ subject="Cost"
+ date="2015-09-26T08:59:39Z"
+ content="""
+If I understand you correctly, the concept of \"cost\" is exactly what you need. You give the box remote a higher cost, and thus you will prefer to download from the remote with a lower cost, when available.
+"""]]
diff --git a/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows/comment_4_9c12c508f62f2e76d09f4ed15af9c74e._comment b/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows/comment_4_9c12c508f62f2e76d09f4ed15af9c74e._comment
new file mode 100644
index 000000000..e24dab781
--- /dev/null
+++ b/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows/comment_4_9c12c508f62f2e76d09f4ed15af9c74e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="graboluk@f6de53961ab0f884e203f602f65eb5cdc0fb7513"
+ nickname="graboluk"
+ subject="is it also broken in debian testing?"
+ date="2015-09-25T17:50:32Z"
+ content="""
+I'm using debian testing version 5.20150731. I've set up an account git-annex on my private server, I've checked that I can login to it just fine, but the box \"Testing server...\" is there indefinitely (I'm trying a login with password)
+"""]]
diff --git a/doc/forum/monitoring_disk_usage_by_different_repos_on_same_drive.mdwn b/doc/forum/monitoring_disk_usage_by_different_repos_on_same_drive.mdwn
new file mode 100644
index 000000000..698413ce3
--- /dev/null
+++ b/doc/forum/monitoring_disk_usage_by_different_repos_on_same_drive.mdwn
@@ -0,0 +1,7 @@
+I've setup a server using gitolite3 to host repositories for our users. All these repos share the same disk (2.5 Tb ;-). They're mainly used as backup of all contents.
+
+I'd like to monitor disk usage (possibly with statistics related to git-annex specificities) for these repos.
+
+Would anyone suggest a solution (web based maybe), for easily monitoring the growth of the repos storage ?
+
+Thanks in advance.
diff --git a/doc/forum/what_are___95__exactly__95___limitations_of_git-annex_when_using_it_like_dropbox.mdwn b/doc/forum/what_are___95__exactly__95___limitations_of_git-annex_when_using_it_like_dropbox.mdwn
new file mode 100644
index 000000000..276ba646e
--- /dev/null
+++ b/doc/forum/what_are___95__exactly__95___limitations_of_git-annex_when_using_it_like_dropbox.mdwn
@@ -0,0 +1,6 @@
+I'm trying to migrate from dropbox to git-annex. But I'm learning that git-annex has "limitations", as in
+"but it can be used to sync files such a way, with certain limitations". So what exactly are these limitations? I've learned already the hard way that newline can't be a character in a filename, and apparently git directories can't be synced?
+
+These are two  big issues imo (especiall the second one) - right now I don't have any filenames with newlines, and no git directories, but the brilliant thing about dropbox is that I don't have to think about such things, everything gets synced.
+
+But in any case, if I'm to use git-annex as a dropbox replacement, I really need to know what precisely are its limitations, so that it doesn't become an issue in two months out of nowhere...
diff --git a/doc/news/version_5.20150916/comment_1_4e708dc3d845a5db6ae1aa05b52f8677._comment b/doc/news/version_5.20150916/comment_1_4e708dc3d845a5db6ae1aa05b52f8677._comment
new file mode 100644
index 000000000..d1837a8ef
--- /dev/null
+++ b/doc/news/version_5.20150916/comment_1_4e708dc3d845a5db6ae1aa05b52f8677._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="jephte.clain@f0da2444b164953b596ac5e3e38da30b8c04e5e3"
+ nickname="jephte.clain"
+ subject="it does not work with debian squeeze lts"
+ date="2015-09-26T08:03:05Z"
+ content="""
+FYI, this version no longer work on debian squeeze lts with the message FATAL: kernel too old
+does it refer to the version of linux kernel? it is 2.6.32-5 on debian squeeze
+For now, I'll have to revert to 5.20150824 which is a shame
+"""]]
diff --git a/doc/todo/does_not_preserve_timestamps/comment_7_eefa6afce824f1069bb5216b392405b7._comment b/doc/todo/does_not_preserve_timestamps/comment_7_eefa6afce824f1069bb5216b392405b7._comment
new file mode 100644
index 000000000..19c508c50
--- /dev/null
+++ b/doc/todo/does_not_preserve_timestamps/comment_7_eefa6afce824f1069bb5216b392405b7._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="fastguy"
+ subject="Any updates?"
+ date="2015-09-25T19:35:18Z"
+ content="""
+Hi, would there be any updates on this issue or do we still not preserve timestamps when syncing between locations?
+"""]]