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

4 files changed, 76 insertions, 0 deletions

diff --git a/doc/bugs/Assistant_removed_all_references_to_files/comment_2_0dbb8df1ad267d1c502646a7131a99f1._comment b/doc/bugs/Assistant_removed_all_references_to_files/comment_2_0dbb8df1ad267d1c502646a7131a99f1._comment
new file mode 100644
index 000000000..932a88471
--- /dev/null
+++ b/doc/bugs/Assistant_removed_all_references_to_files/comment_2_0dbb8df1ad267d1c502646a7131a99f1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://andrew.aylett.co.uk/"
+ nickname="andrew"
+ subject="comment 2"
+ date="2014-09-11T19:03:07Z"
+ content="""
+Unfortunately, that bug involves merges while I'm seeing regular commits so I don't think it's identical.
+
+As to why I'm on that version, it appears that the updater and something in my environment conspired against me, leaving an old version in my path.  I'll fix that now and let you know if I see the issue again.
+"""]]
diff --git a/doc/bugs/Bloom_filter_capacity_too_large_to_represent.mdwn b/doc/bugs/Bloom_filter_capacity_too_large_to_represent.mdwn
new file mode 100644
index 000000000..2fb69522e
--- /dev/null
+++ b/doc/bugs/Bloom_filter_capacity_too_large_to_represent.mdwn
@@ -0,0 +1,41 @@
+### Please describe the problem.
+When running git-annex info I get an error when it tries to show the bloom filter size
+
+### What steps will reproduce the problem?
+git-annex info in my Photos repo
+
+
+### What version of git-annex are you using? On what operating system?
+[[!format sh """
+$ git-annex version
+git-annex version: 5.20140814-g9b89b5c
+build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
+local repository version: 5
+supported repository version: 5
+upgrade supported from repository versions: 0 1 2 4
+"""]]
+
+### Please provide any additional information below.
+
+[[!format sh """
+$ git-annex info           
+repository mode: direct
+trusted repositories: 2
+        c0e4106e-2631-11e2-9749-1bfa37a61069 -- [rose]
+        ca735977-973c-44bc-9257-915b2c875e39 -- synology [here]
+semitrusted repositories: 3
+        00000000-0000-0000-0000-000000000001 -- web
+        7e5c0010-2634-4a5e-bc7b-6fea84b8b947 -- [glacier]
+        d7e01abc-d74b-40e2-8607-3d41ce8bc4bd -- seagate3
+untrusted repositories: 1
+        c1fe5922-43f1-11e2-b146-33530f7fa6cc -- x200s
+transfers in progress: none
+available local disk space: 928.4 gigabytes (+1 megabyte reserved)
+local annex keys: 34758 
+local annex size: 186.78 gigabytes
+annexed files in working tree: 35300
+size of annexed files in working tree: 193.76 gigabytes
+bloom filter size: git-annex: Data.BloomFilter.Util.suggestSizing: capacity too large to represent
+"""]]
diff --git a/doc/bugs/Bloom_filter_capacity_too_large_to_represent/comment_1_43c824a3b843faa2377bfd78158c72fe._comment b/doc/bugs/Bloom_filter_capacity_too_large_to_represent/comment_1_43c824a3b843faa2377bfd78158c72fe._comment
new file mode 100644
index 000000000..0bf00d7d5
--- /dev/null
+++ b/doc/bugs/Bloom_filter_capacity_too_large_to_represent/comment_1_43c824a3b843faa2377bfd78158c72fe._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.132"
+ subject="comment 1"
+ date="2014-09-12T16:03:09Z"
+ content="""
+It seems you must have tweaked the annex.bloomcapacity and/or annex.bloomaccuracy settings, probably to some quite large values.
+
+For example capacity of 50000000 and accuracy of 10000000000 will fail this way.
+
+This happens when it runs out of Double floating point precision to calculate the requested bloom filter size. I think that a bloom filter can be built that has this capacity/accuracy, it's just that Data.BloomFilter.Easy.safeSuggestSizing falls over trying to find the bloom filter size. Also, such a bloom filter may use rather a lot of memory..
+
+
+"""]]
diff --git a/doc/forum/Pusher_crashed__44___attempt_to_repair_hangs__44___broken_symlinks/comment_1_c89b64b0dc7c5a760a84a9d2cfd8982c._comment b/doc/forum/Pusher_crashed__44___attempt_to_repair_hangs__44___broken_symlinks/comment_1_c89b64b0dc7c5a760a84a9d2cfd8982c._comment
new file mode 100644
index 000000000..38bd4daf8
--- /dev/null
+++ b/doc/forum/Pusher_crashed__44___attempt_to_repair_hangs__44___broken_symlinks/comment_1_c89b64b0dc7c5a760a84a9d2cfd8982c._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="divB"
+ ip="128.12.90.218"
+ subject="comment 1"
+ date="2014-09-12T02:47:37Z"
+ content="""
+I try it once again - any hints for me?
+I haven't done anything since then because I do not know how to proceed here (except creating everything new from scratch).
+
+Is more information needed? If yes, what?
+"""]]