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

3 files changed, 57 insertions, 3 deletions

diff --git a/doc/bugs/Can__39__t_create_remote_for_Google_cloud_storage_DRA___47___nearline_buckets.mdwn b/doc/bugs/Can__39__t_create_remote_for_Google_cloud_storage_DRA___47___nearline_buckets.mdwn
new file mode 100644
index 000000000..35c157e22
--- /dev/null
+++ b/doc/bugs/Can__39__t_create_remote_for_Google_cloud_storage_DRA___47___nearline_buckets.mdwn
@@ -0,0 +1,42 @@
+### Please describe the problem.
+
+Creating a remote for a GCS durable reduced availability (DRA) or nearline bucket fails with "Invalid argument".
+
+### What steps will reproduce the problem?
+
+    $ git annex initremote test encryption=none bucket=BUCKET type=S3 host=storage.googleapis.com
+
+This works if BUCKET is a standard bucket, but fails with "invalid argument" if BUCKET is a DRA or nearline bucket.
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex version: 5.20150205
+on macos 10.10
+
+### Please provide any additional information below.
+
+I spent some time in strace, and my best guess is that this is because git-annex is sending x-amz-storage-class: STANDARD.  I couldn't figure out a way to disable this; if I did e.g.
+
+    $ git annex initremote test encryption=none bucket=BUCKET type=S3 host=storage.googleapis.com storageclass="NEARLINE"
+
+it still fails and still sends storage-class: STANDARD.  I also tried storageclass="" -- same thing.
+
+Here's the HTTP request that's failing:
+
+    PUT /annex-uuid HTTP/1.1\r\nAuthorization: AWS GOOG<...>:<...>=\r\nDate: Mon, 16 Mar 2015 01:41:38 GMT\r\nHost: jlebar-backup-annex-nearline-test.storage.googleapis.com\r\nContent-Type: \r\nx-amz-storage-class: STANDARD\r\nContent-Length: 36\r\n\r\n<...>
+
+And the (rather unhelpful) HTTP response:
+
+    HTTP/1.1 400 Bad Request\r\nContent-Type: application/xml; charset=UTF-8\r\nContent-Length: 117\r\nVary: Origin\r\nDate: Mon, 16 Mar 2015 01:41:38 GMT\r\nServer: UploadServer      (\"Built on Feb 27 2015 12:13:16 (1425067996)\")\r\nAlternate-Protocol: 80:quic,p=0.5\r\n\r\n<?xml version='1.0' encoding='UTF-8'?><Error><Code>InvalidArgument</Code><Message>Invalid argument.</ Message></Error>
+
+[[!format sh """
+
+$ AWS_ACCESS_KEY_ID=... AWS_SECRET_ACCESS_KEY="..." git annex --debug initremote test encryption=none bucket=<DRA bucket> type=S3 host=storage.googleapis.com
+[2015-03-15 19:12:19 PDT] read: git ["--git-dir=.git","--work-tree=.","show-ref","git-annex"]
+[2015-03-15 19:12:19 PDT] read: git ["--git-dir=.git","--work-tree=.","show-ref","--hash","refs/heads/git-annex"]
+[2015-03-15 19:12:19 PDT] read: git ["--git-dir=.git","--work-tree=.","log","refs/heads/git-annex..d7640d68e3bd55735fb275816df0b94ec05031a7","-n1","--pretty=%H"]
+[2015-03-15 19:12:20 PDT] chat: git ["--git-dir=.git","--work-tree=.","cat-file","--batch"]
+initremote test (checking bucket...) git-annex: S3Error {s3StatusCode = Status {statusCode = 400, statusMessage = "Bad Request"}, s3ErrorCode = "InvalidArgument", s3ErrorMessage = "Invalid argument.", s3ErrorResource = Nothing, s3ErrorHostId = Nothing, s3ErrorAccessKeyId = Nothing, s3ErrorStringToSign = Nothing}
+
+# End of transcript or log.
+"""]]
diff --git a/doc/bugs/android_ed25519_algorithm.mdwn b/doc/bugs/android_ed25519_algorithm.mdwn
new file mode 100644
index 000000000..c32be4e89
--- /dev/null
+++ b/doc/bugs/android_ed25519_algorithm.mdwn
@@ -0,0 +1,12 @@
+### Please describe the problem.
+Openssh was not compiled to support ed25519 algorithm
+
+### What steps will reproduce the problem?
+only enable ed25519 on server and try to connect via ssh.
+fails with "no hostkey alg"
+
+### What version of git-annex are you using? On what operating system?
+5.20150219-gd24cfd3, Android 5.0.1
+
+regards,
+David
diff --git a/doc/install/fromsource.mdwn b/doc/install/fromsource.mdwn
index 98a517b14..1e96cce40 100644
--- a/doc/install/fromsource.mdwn
+++ b/doc/install/fromsource.mdwn
@@ -36,9 +36,9 @@ inside the source tree.
 
 ## minimal build with cabal
 
-This can be done anywhere, and builds git-annex without some features that
-require C libraries, that can be harder to get installed. This is plenty to
-get started using it, although it does not include the assistant or webapp.
+This can be done anywhere, and builds git-annex without some optional features
+that require harder-to-install C libraries. This is plenty to let you get started with
+git-annex, but it does not include the assistant or webapp.
 
 Inside the source tree, run: