Merge 1.5.2 changes back to master.
diff --git a/src/jdbc-auth.md b/src/jdbc-auth.md
index 848a35b..0fa2ca8 100644
--- a/src/jdbc-auth.md
+++ b/src/jdbc-auth.md
@@ -592,6 +592,14 @@
application after an access window closes, set this to "false". Users will
always be prevented from logging in outside of access windows regardless of
this setting.
+
+`mysql-batch-size`
+: Controls how many objects may be retrieved from the database in a single
+ query. If more objects than this number are requested, retrieval of those
+ objects will be automatically and transparently split across multiple
+ queries.
+
+ By default, MySQL/MariaDB queries will retrieve no more than 1000 objects.
:::
:::{tab} PostgreSQL
@@ -670,6 +678,7 @@
abort queries that take too long. A value of 0 (the default) means the
timeout is disabled.
+<<<<<<< HEAD
`postgresql-track-external-connection-history`
: Whether connection history records should be created for connections not
defined in the database. By default, external connection history will be
@@ -682,6 +691,15 @@
application after an access window closes, set this to "false". Users will
always be prevented from logging in outside of access windows regardless of
this setting.
+=======
+`postgresql-batch-size`
+: Controls how many objects may be retrieved from the database in a single
+ query. If more objects than this number are requested, retrieval of those
+ objects will be automatically and transparently split across multiple
+ queries.
+
+ By default, PostgreSQL queries will retrieve no more than 5000 objects.
+>>>>>>> staging/1.5.2
:::
:::{tab} SQL Server
@@ -714,6 +732,7 @@
the SQL Server installation. This property is optional, and most installations
should work without the need to specify an instance name.
+<<<<<<< HEAD
`sqlserver-track-external-connection-history`
: Whether connection history records should be created for connections not
defined in the database. By default, external connection history will be
@@ -726,6 +745,15 @@
application after an access window closes, set this to "false". Users will
always be prevented from logging in outside of access windows regardless of
this setting.
+=======
+`sqlserver-batch-size`
+: Controls how many objects may be retrieved from the database in a single
+ query. If more objects than this number are requested, retrieval of those
+ objects will be automatically and transparently split across multiple
+ queries.
+
+ By default, SQL Server queries will retrieve no more than 1000 objects.
+>>>>>>> staging/1.5.2
:::
#### Enforcing password policies
