Merge branch 'master' into dev

4 years ago · 4fceb7100a
parent c63c1d5355 3a1328c23e
commit 4fceb7100a
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -197,9 +197,6 @@ do
 	# Disable I/O statistics accounting
 	write "$queue/iostats" 0

-	# Only attempt simple merges
-	write "$queue/nomerges" 1
-
 	# Reduce heuristic read-ahead in exchange for I/O latency
 	write "$queue/read_ahead_kb" 16