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

6 files changed, 60 insertions, 1 deletions

diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn b/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn
new file mode 100644
index 000000000..71402b1b2
--- /dev/null
+++ b/doc/bugs/Local_pairing_fails:_PairListener_crashed.mdwn
@@ -0,0 +1,16 @@
+What steps will reproduce the problem?
+
+Attempting to pair between a local repository and a repository on a remote computer on my LAN. Pairing is initiated from my local machine and I'm interacting with the webapp on the remote machine via firefox running over an ssh -X connection. Pairing appears to work up to a point: I enter the secret at one end, the pairing request shows up at the other end. I then enter the secret at that end.
+
+What is the expected output? What do you see instead?
+
+Pairing should complete successfully. Instead I get the error message "PairListener crashed: bad comment in public key", followed by the public key. The pairing process then does not move beyond the 'awaiting pairing' pages.
+
+What version of git-annex are you using? On what operating system?
+
+Local Machine: 3.20121127, Debian Wheezy/Sid (the only package from unstable is git-annex).
+Remote Machine: 3.20121113, Arch Linux (I installed the version from: https://aur.archlinux.org/packages/git-annex-bin/, which is supposedly the same as above, but reports the version specified here).
+
+Please provide any additional information below.
+
+None as yet. Let me know if there are any log files, etc. that I can post.
diff --git a/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment b/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment
new file mode 100644
index 000000000..4dd77f04d
--- /dev/null
+++ b/doc/bugs/Local_pairing_fails:_PairListener_crashed/comment_1_d9c5d2147cf6d8d8477eb13b72081d46._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="4.152.108.72"
+ subject="comment 1"
+ date="2012-12-04T17:38:47Z"
+ content="""
+On the machine that didn't crash, run:
+
+ssh-keygen -P \"\" -f test; cat test.pub
+
+Probably the non-alphanumeric character is part of the machine's hostname, or perhaps your username. We'll see..
+"""]]
diff --git a/doc/design/assistant/blog/day_141__release_tuesday/comment_1_a5adea7a726df12f9121c744a036f08d._comment b/doc/design/assistant/blog/day_141__release_tuesday/comment_1_a5adea7a726df12f9121c744a036f08d._comment
new file mode 100644
index 000000000..69fb64778
--- /dev/null
+++ b/doc/design/assistant/blog/day_141__release_tuesday/comment_1_a5adea7a726df12f9121c744a036f08d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnbBRfl5F8gKRr1ko8Ai6FbEZStXXNF1S4"
+ nickname="Áron"
+ subject="deb package for amd64"
+ date="2012-12-04T08:51:55Z"
+ content="""
+Hey, great work!
+Will we also have 64bit binaries in debian unstable soon?
+
+"""]]
diff --git a/doc/design/assistant/blog/day_143__what_next/comment_1_40cf25a2ebdd43d8974a28e180e100e5._comment b/doc/design/assistant/blog/day_143__what_next/comment_1_40cf25a2ebdd43d8974a28e180e100e5._comment
new file mode 100644
index 000000000..28ef42975
--- /dev/null
+++ b/doc/design/assistant/blog/day_143__what_next/comment_1_40cf25a2ebdd43d8974a28e180e100e5._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="http://1id.com/contact/=tp"
+ nickname="Tom"
+ subject="In case it might be helpful"
+ date="2012-12-04T14:25:14Z"
+ content="""
+S3 and Glacier regions.  
+<http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region>  
+<http://docs.amazonwebservices.com/general/latest/gr/rande.html#glacier_region>
+
+(EC2) Region list API - likely a superset of the other service regions, could be used for sanity checks.  
+<http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html>
+"""]]
diff --git a/doc/design/assistant/polls/Android.mdwn b/doc/design/assistant/polls/Android.mdwn
index 589004fca..7debe3fc0 100644
--- a/doc/design/assistant/polls/Android.mdwn
+++ b/doc/design/assistant/polls/Android.mdwn
@@ -15,4 +15,4 @@ git-annex.
 Or, I can work on [[Android_porting|design/assistant/android]], and try to
 get the assistant working on Android's built-in storage.
 
-[[!poll open=yes 63 "solve the symlink problem first" 15 "port to Android first" 0 "other"]]
+[[!poll open=yes 80 "solve the symlink problem first" 17 "port to Android first" 1 "other"]]
diff --git a/doc/forum/mistakenly_checked___42__files__42___into_an_annex.__bummer./comment_2_db6f4959c35732f72e7a90bd9f4c665c._comment b/doc/forum/mistakenly_checked___42__files__42___into_an_annex.__bummer./comment_2_db6f4959c35732f72e7a90bd9f4c665c._comment
new file mode 100644
index 000000000..9c7f35a77
--- /dev/null
+++ b/doc/forum/mistakenly_checked___42__files__42___into_an_annex.__bummer./comment_2_db6f4959c35732f72e7a90bd9f4c665c._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="173.162.44.162"
+ subject="comment 2"
+ date="2012-12-03T15:46:48Z"
+ content="""
+Thanks!  I ended up going with the uninit plan.
+"""]]