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

6 files changed, 44 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 5a0cebb28..7baa18b3f 100644
--- a/Makefile
+++ b/Makefile
@@ -162,10 +162,11 @@ osxapp: Build/Standalone Build/OSXMkLibs
 
 	./Build/OSXMkLibs $(OSXAPP_BASE)
 	rm -f tmp/git-annex.dmg
-	hdiutil create -size 640m -format UDRW -srcfolder tmp/build-dmg \
+	hdiutil create -format UDBZ -srcfolder tmp/build-dmg \
 		-volname git-annex -o tmp/git-annex.dmg
+	# temporarily still create compressed image too
 	rm -f tmp/git-annex.dmg.bz2
-	bzip2 --fast tmp/git-annex.dmg
+	bzip2 --fast < tmp/git-annex.dmg > tmp/git-annex.dmg.bz2
 
 ANDROID_FLAGS?=-f-XMPP
 # Cross compile for Android.
diff --git a/doc/bugs/Glacier_remote_uploads_duplicates/comment_8_34216b514a6fca788cfacb8579ce5311._comment b/doc/bugs/Glacier_remote_uploads_duplicates/comment_8_34216b514a6fca788cfacb8579ce5311._comment
new file mode 100644
index 000000000..67fd5354b
--- /dev/null
+++ b/doc/bugs/Glacier_remote_uploads_duplicates/comment_8_34216b514a6fca788cfacb8579ce5311._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
+ nickname="Jimmy"
+ subject="For those on Mac OS X"
+ date="2013-11-18T00:00:32Z"
+ content="""
+The duplicates script fails because the BSD/MacOS version of uniq doesn't support the -D option.
+
+You can work around this by installing the GNU version using Homebrew ('brew install coreutils') and then replacing the 'uniq' in the script with 'guniq' (Homebrew prefixes the coreutils with \"g\" by default).
+
+I seem to still be running in to this bug using git annex version 4.20131106 and 'git annex copy --to glacier' without the '--not --in glacier' flags.  It's not a problem to use the extra flags but I wasn't originally aware of this issue and the duplicates don't seem to always occur.  I'll do some more testing and see whether I can reliably predict what will create duplicates and what won't.
+"""]]
diff --git a/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn b/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn
index 010bf9115..bf74aebe6 100644
--- a/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn
+++ b/doc/bugs/OSX_.dmg_unnecessarily_large_and_not_inherently_compressed.mdwn
@@ -64,3 +64,5 @@ index 5a0cebb..b6ac549 100644
 -- 
 1.8.4.3
 </pre>
+
+> Ah, that never seemed optimal. [[done]] --[[Joey]]
diff --git a/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_12_41fbee0ec9bc890e309bcd48a58c3851._comment b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_12_41fbee0ec9bc890e309bcd48a58c3851._comment
new file mode 100644
index 000000000..d707de6e1
--- /dev/null
+++ b/doc/forum/git-annex_assistant_with_2_dedicated_servers/comment_12_41fbee0ec9bc890e309bcd48a58c3851._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="David"
+ ip="178.21.48.117"
+ subject="comment 12"
+ date="2013-11-18T11:25:06Z"
+ content="""
+Hello,
+
+Thanks for your help and explanation. Now I had some time to test git-annex and I had a sad experience. I tried to sync the files from server1 to server2 (as described before). We are talking about 87000 small files (these are maildir folders and each file is an e-mail) with the total size of 19 Gbytes. After a few hours git-annex assistant consumed all memory on both servers ... and then all swap ... and then kernel killed git-annex. The servers have 512 MB RAM and 1 GB swap.
+
+According to the Scalability page (http://git-annex.branchable.com/scalability/) the \"memory usage should be constant\" and I am sure I didn't run \"git-annex unused\".
+
+Is this memory consumption normal or it might be a bug? What shall we do?
+
+Thanks,
+
+David
+"""]]
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index 84b960e51..626210fa1 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -28,7 +28,7 @@ the app for OSX Lion.
 
 [[Joey]] autobuilds the app for Mavericks.
 
-* [autobuild of git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/git-annex.dmg.bz2) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/))
+* [autobuild of git-annex.dmg](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/git-annex.dmg) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-mavericks/))
 
 ## using Brew
 
diff --git a/doc/special_remotes/glacier/comment_6_adb1db354dc4941e4b004e4ba34660d7._comment b/doc/special_remotes/glacier/comment_6_adb1db354dc4941e4b004e4ba34660d7._comment
new file mode 100644
index 000000000..717060fcb
--- /dev/null
+++ b/doc/special_remotes/glacier/comment_6_adb1db354dc4941e4b004e4ba34660d7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
+ nickname="Jimmy"
+ subject="I know this thread is old but..."
+ date="2013-11-18T00:27:50Z"
+ content="""
+It's working well for me, though I seem to sometimes still hit the duplicate bug listed above.
+"""]]