Merge branch 'master' into update-couchdb-defaults
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 3a36394..055775f 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -46,7 +46,7 @@
 ; due to variabiliy in what is escaped or how floats are encoded, this limit is
 ; applied conservatively. For example 1.0e+16 could be encoded as 1e16, so 4 used
 ; for size calculation instead of 7.
-;max_document_size = 4294967296 ; bytes
+max_document_size = 8000000 ; bytes
 ;
 ; Maximum attachment size.
 ; max_attachment_size = infinity
@@ -88,7 +88,7 @@
 couch = couch_bt_engine
 
 [cluster]
-q=8
+q=2
 n=3
 ; placement = metro-dc-a:2,metro-dc-b:1
 
diff --git a/src/couch/src/couch_multidb_changes.erl b/src/couch/src/couch_multidb_changes.erl
index ec80563..7c0f967 100644
--- a/src/couch/src/couch_multidb_changes.erl
+++ b/src/couch/src/couch_multidb_changes.erl
@@ -744,7 +744,7 @@
     ?_test(begin
         DbName = ?tempdb(),
         ok = fabric:create_db(DbName, [?CTX]),
-        ?assertEqual(8, length(local_shards(DbName))),
+        ?assertEqual(2, length(local_shards(DbName))),
         fabric:delete_db(DbName, [?CTX])
     end).