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

5 files changed, 72 insertions, 1 deletions

diff --git a/doc/bugs/WebDAV_HandshakeFailed_/comment_8_e834f791d3000669fab25732a7c72ab3._comment b/doc/bugs/WebDAV_HandshakeFailed_/comment_8_e834f791d3000669fab25732a7c72ab3._comment
new file mode 100644
index 000000000..8858c8c49
--- /dev/null
+++ b/doc/bugs/WebDAV_HandshakeFailed_/comment_8_e834f791d3000669fab25732a7c72ab3._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlqOu7P4tb4D-Xo2pYrjln2NsAObtErliM"
+ nickname="Alexander"
+ subject="box.com fixed"
+ date="2013-03-29T15:15:31Z"
+ content="""
+yes, box.com is now working. thanks.
+
+german telekom still doesn't work though, due to the lock/unlock issue; see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698379
+
+best regards,
+alexander
+"""]]
diff --git a/doc/bugs/host_with_rysnc_installed__44___not_recognized/comment_4_99d1f151263ca3433dd4afa8a928b1fe._comment b/doc/bugs/host_with_rysnc_installed__44___not_recognized/comment_4_99d1f151263ca3433dd4afa8a928b1fe._comment
new file mode 100644
index 000000000..ed377251c
--- /dev/null
+++ b/doc/bugs/host_with_rysnc_installed__44___not_recognized/comment_4_99d1f151263ca3433dd4afa8a928b1fe._comment
@@ -0,0 +1,30 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmaygIuV4bIfp-U5IRH51FwKHq-i7_os0c"
+ nickname="Mike"
+ subject="comment 4"
+ date="2013-03-29T04:03:44Z"
+ content="""
+running the shell script directly:
+    > ./test.sh                             23:43:25
+
+	git-annex-probe loggedin
+
+	/usr/local/bin/rsync
+
+	git-annex-probe rsync
+
+Running your ssh command:
+
+	git-annex-probe loggedin
+
+	if: Expression Syntax.
+
+Running the shell script through ssh:
+	ssh $HOSTNAME ./test.sh                              23:54:39
+
+	git-annex-probe loggedin
+
+	/usr/local/bin/rsync
+
+	git-annex-probe rsync
+"""]]
diff --git a/doc/bugs/host_with_rysnc_installed__44___not_recognized/comment_5_6ef1a377b0b4d3efeffdf9693d0b496b._comment b/doc/bugs/host_with_rysnc_installed__44___not_recognized/comment_5_6ef1a377b0b4d3efeffdf9693d0b496b._comment
new file mode 100644
index 000000000..b62c8a9ec
--- /dev/null
+++ b/doc/bugs/host_with_rysnc_installed__44___not_recognized/comment_5_6ef1a377b0b4d3efeffdf9693d0b496b._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 5"
+ date="2013-03-29T16:47:28Z"
+ content="""
+Sounds like it may not provide a POSIX shell for interactive use (based on the error message, I think it's csh), in which case this could work:
+
+    ssh $HOSTNAME -n 'sh -c \"echo git-annex-probe loggedin;if which git-annex-shell; then echo git-annex-probe git-annex-shell; fi;if which rsync; then echo git-annex-probe rsync; fi\"'
+
+
+"""]]
diff --git a/doc/design/assistant/blog/day_223__progress_revisited.mdwn b/doc/design/assistant/blog/day_223__progress_revisited.mdwn
index 6946afdf0..9f899899d 100644
--- a/doc/design/assistant/blog/day_223__progress_revisited.mdwn
+++ b/doc/design/assistant/blog/day_223__progress_revisited.mdwn
@@ -9,7 +9,7 @@ about whether an update contained the total number of bytes transferred, or
 the delta of bytes transferred since the last update. One way this bug
 showed up was progress bars that seemed to stick at 0% for a long time.
 Happened for most special remotes, although not for rsync or git remotes.
-In order to fix it comprehensively, I add a new BytesProcessed data type,
+In order to fix it comprehensively, I added a new BytesProcessed data type,
 that is explicitly a total quantity of bytes, not a delta. And checked and
 fixed all the places that used a delta as that type was knitted into
 the code.
diff --git a/doc/special_remotes/rsync/comment_1_9e180c397486989beab21699b8e8f103._comment b/doc/special_remotes/rsync/comment_1_9e180c397486989beab21699b8e8f103._comment
new file mode 100644
index 000000000..a4c403e7e
--- /dev/null
+++ b/doc/special_remotes/rsync/comment_1_9e180c397486989beab21699b8e8f103._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="diepes"
+ ip="105.227.34.36"
+ subject="rsync description and example"
+ date="2013-03-29T15:57:20Z"
+ content="""
+Hi, I would like to see a example of setting up / using e.g. rsync.net as a repo.
+
+
+Please also provide a highlevel description of how the rsync repo fits in with git-annex.
+
+ 
+Q1. can you adds files to the remote rsync repo, and will they be detected and synced back ?
+Q2. is all the git history rsync'd to remote ?   how do i recover if i loose all data except the remote rsync repo ?
+  
+"""]]