krb5 commit [krb5-1.15]: Suggest unlocked iteration for mkey rollover

[Tom Yu]

https://github.com/krb5/krb5/commit/6ad31738bb440d068315ba00bd24b87a969d448f
commit 6ad31738bb440d068315ba00bd24b87a969d448f
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Oct 6 11:28:33 2016 -0400

    Suggest unlocked iteration for mkey rollover
    
    In database.rst when discussing the procedure for master key rollover,
    suggest using unlocked iteration for large databases.  Also make it
    clear that unavailability due to locking during iteration is specific
    to DB2.
    
    (cherry picked from commit e71f4dcb5e4cc0e100caa75a8d2835dac2a6a32d)
    
    ticket: 8507
    version_fixed: 1.15

 doc/admin/database.rst |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/admin/database.rst b/doc/admin/database.rst
index c7abc1b..078abc7 100644
--- a/doc/admin/database.rst
+++ b/doc/admin/database.rst
@@ -527,9 +527,13 @@ availability.  To roll over the master key, follow these steps:
 
 #. On the master KDC, run ``kdb5_util update_princ_encryption``.  This
    command will iterate over the database and re-encrypt all keys in
-   the new master key.  If the database is large, the master KDC will
-   become unavailable while this command runs, but clients should fail
-   over to slave KDCs (if any are present) during this time period.
+   the new master key.  If the database is large and uses DB2, the
+   master KDC will become unavailable while this command runs, but
+   clients should fail over to slave KDCs (if any are present) during
+   this time period.  In release 1.13 and later, you can instead run
+   ``kdb5_util -x unlockiter update_princ_encryption`` to use unlocked
+   iteration; this variant will take longer, but will keep the
+   database available to the KDC and kadmind while it runs.
 
 #. On the master KDC, run ``kdb5_util purge_mkeys`` to clean up the
    old master key.